Updated Branches:
  refs/heads/master 8acc85ca5 -> 67f9467c5

CLOUDSTACK-697: Reordered the LICENSE and NOTICE file content (as well as 
descriptor.xml).

Signed-off-by: Chip Childers <[email protected]>

Conflicts:

        LICENSE
        tools/whisker/descriptor.xml


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

Branch: refs/heads/master
Commit: 67f9467c5dbae56666dd6136a77fa7ea522f1d7b
Parents: 8acc85c
Author: Chip Childers <[email protected]>
Authored: Fri Dec 21 10:09:31 2012 -0500
Committer: Chip Childers <[email protected]>
Committed: Fri Dec 21 10:35:50 2012 -0500

----------------------------------------------------------------------
 LICENSE                      | 3474 ++++++++++++++++++-------------------
 NOTICE                       |  146 +-
 tools/whisker/descriptor.xml |   43 +-
 3 files changed, 1824 insertions(+), 1839 deletions(-)
----------------------------------------------------------------------


Reply via email to