cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nitin-maharana <...@git.apache.org>
Subject [GitHub] cloudstack pull request: CLOUDSTACK-9068: Listing Port Forwarding ...
Date Tue, 17 Nov 2015 16:15:35 GMT
GitHub user nitin-maharana opened a pull request:

    https://github.com/apache/cloudstack/pull/1080

    CLOUDSTACK-9068: Listing Port Forwarding Rules take too much time to load

    

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/nitin-maharana/cloudstack CloudStack-Nitin13

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/cloudstack/pull/1080.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #1080
    
----
commit 1f53f2a93ea57c33b29b641b156b1e16df9dddff
Author: Remi Bergsma <github@remi.nl>
Date:   2015-11-15T17:48:59Z

    Updating pom.xml version numbers for release 4.7.0-SNAPSHOT
    
    Signed-off-by: Remi Bergsma <github@remi.nl>

commit 6536992671f37967f1abb764feb7e3a4d9b959fb
Author: Remi Bergsma <github@remi.nl>
Date:   2015-11-15T18:11:50Z

    implement upgrade paths from 4.6.0/4.6.1 to 4.7.0

commit 704cbe0ec62697a36dea5f121a21745026dc00f9
Author: Remi Bergsma <github@remi.nl>
Date:   2015-11-15T20:29:08Z

    Add 4.7.0-SNAPSHOT to Debian changelog

commit ea7c2d95b28e442df64607e914f66bd4517f2e03
Author: Remi Bergsma <github@remi.nl>
Date:   2015-11-16T07:46:13Z

    Merge pull request #1068 from remibergsma/460_470_upgrade_path
    
    Make master 4.7.0-SNAPSHOT and implement upgrade paths towards itThis bumps all pom.xml
versions to 4.7.0-SNAPSHOT. It also implements upgrade paths from 4.6.0 and the upcoming 4.6.1
(branch 4.6 is now on 4.6.1-SNAPSHOT) towards 4.7.0.
    
    I will be doing some upgrade tests, will post back results soon.
    
    * pr/1068:
      Add 4.7.0-SNAPSHOT to Debian changelog
      implement upgrade paths from 4.6.0/4.6.1 to 4.7.0
      Updating pom.xml version numbers for release 4.7.0-SNAPSHOT
    
    Signed-off-by: Remi Bergsma <github@remi.nl>

commit 17219dfe791320f331c325d54efd01af97ceeb1a
Author: Rajani Karuturi <rajani.karuturi@citrix.com>
Date:   2015-11-16T10:13:08Z

    Merge release branch 4.6 to master
    
    * 4.6:
      more poms didn't get updated with script
      implemented upgrade path from 4.6.0 to 4.6.1
      checkstyle pom didn't get updated with script
      debian: add 4.6.1-snapshot to changelog
      Updating pom.xml version numbers for release 4.6.1-SNAPSHOT
      Updating pom.xml version numbers for release 4.6.0

commit 9ed8151169b95656c8ce2fac50745af49cf48169
Author: Rajani Karuturi <rajani.karuturi@citrix.com>
Date:   2015-11-16T10:26:59Z

    Fixed version number in build/replace.properties

commit bf0c4f2ecb425201e7cad4762c27d654f7cb9996
Author: Remi Bergsma <github@remi.nl>
Date:   2015-11-17T08:25:45Z

    Merge pull request #1071 from karuturi/merge-46-to-master
    
    Merge 4.6 release branch to masterInitial merge of 4.6 to master
    ignored pom.xml version number changes and changes to debian/changelog and engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
    
    Following commands were executed
    ```
    1. git checkout 4.6
    2. git pull --rebase
    3. git checkout master
    4. git pull --rebase
    5. git fwd-merge 4.6
    6. git diff --name-only | grep pom.xml | xargs git checkout --ours
    7. git diff --name-only | grep pom.xml | xargs git add
    8. git checkout --ours engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
    9. git add engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
    10. git checkout --ours debian/changelog
    11. git add debian/changelog
    12. # manually edited version number in tools/marvin/marvin/deployAndRun.py and tools/marvin/setup.py
    13. git commit
    14. git checkout -b "merge-46-to-master"
    ```
    
    * pr/1071:
      Fixed version number in build/replace.properties
      more poms didn't get updated with script
      implemented upgrade path from 4.6.0 to 4.6.1
      checkstyle pom didn't get updated with script
      debian: add 4.6.1-snapshot to changelog
      Updating pom.xml version numbers for release 4.6.1-SNAPSHOT
      Updating pom.xml version numbers for release 4.6.0
    
    Signed-off-by: Remi Bergsma <github@remi.nl>

commit 3aa63dc76ac1869d62ce42d8e5dc2752ebe71601
Author: Nitin Kumar Maharana <nitin.maharana@gmail.com>
Date:   2015-11-17T11:57:26Z

    CLOUDSTACK-9068: Listing Port Forwarding Rules take too much time to load
    
    For setting the width of each data item for each row of portforwarding rules, it was processing
all rules.
    Basically for each data item, it was searching in all rules, which is un-necessary.
    If there are N-Rules, It was processing N-times.
    
    Now, it only processes one time by taking all N-rules at a time.
    The previous solution was of O(NxN). Now its changed to O(N).

commit 23f435414474ec785429cd07473f2edabbc700f3
Author: Nitin Kumar Maharana <nitin.maharana@gmail.com>
Date:   2015-11-17T15:41:31Z

    Update multiEdit.js

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message