You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2016/02/26 17:16:47 UTC

[1/2] git commit: updated refs/heads/master to 359d20e [Forced Update!]

Repository: cloudstack
Updated Branches:
  refs/heads/master 7a9bfce42 -> 359d20e8d (forced update)


Merge release branch 4.7 to 4.8

* 4.7:
  CLOUDSTACK-9267: String is not localized on create instance wizards.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/12a4ca28
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/12a4ca28
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/12a4ca28

Branch: refs/heads/master
Commit: 12a4ca28c47b0c430d0ef7f1c793b70ebab818f1
Parents: be89f64 9610056
Author: Rafael Weingärtner <ra...@apache.org>
Authored: Fri Feb 26 13:07:57 2016 -0300
Committer: Rafael Weingärtner <ra...@apache.org>
Committed: Fri Feb 26 13:07:57 2016 -0300

----------------------------------------------------------------------
 ui/scripts/network.js                  | 8 ++++----
 ui/scripts/ui-custom/instanceWizard.js | 2 +-
 ui/scripts/ui-custom/projects.js       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------

[2/2] git commit: updated refs/heads/master to 359d20e

Posted by ra...@apache.org.
Merge release branch 4.8 to master

* 4.8:
  CLOUDSTACK-9267: String is not localized on create instance wizards.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/359d20e8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/359d20e8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/359d20e8

Branch: refs/heads/master
Commit: 359d20e8d6d11a992755926a0cf1b1f2a5454487
Parents: 908b769 12a4ca2
Author: Rafael Weingärtner <ra...@apache.org>
Authored: Fri Feb 26 13:15:58 2016 -0300
Committer: Rafael Weingärtner <ra...@apache.org>
Committed: Fri Feb 26 13:15:58 2016 -0300

----------------------------------------------------------------------
 ui/scripts/network.js                  | 8 ++++----
 ui/scripts/ui-custom/instanceWizard.js | 2 +-
 ui/scripts/ui-custom/projects.js       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------