14074 Commits

Author SHA1 Message Date
Marcus Sorensen
a3c9a2b22d Summary: prepare-commit-msg skip merges, -m flag, squash, template
Detail: prepare-commit-msg now is skipped if -m flag is supplied, if user has
a template defined, if commit is a squash or a merge.

BUG-ID : none
Reviewed-by: Marcus Sorensen <marcus@betterservers.com>
Reported-by: Marcus Sorensen <marcus@betterservers.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1350600822 -0600
2012-10-18 16:53:42 -06:00
Brian Federle
e61aa3aa74 Don't create tag widget in quickview mode 2012-10-18 15:25:09 -07:00
Brian Federle
d32eacf502 Section select UI: CSS update
-Remove 'div.list-view' from selector, to allow styling to be used
 across other widgets in the future
2012-10-18 15:04:03 -07:00
Marcus Sorensen
4d3b81cf36 ################################# 80 chars #####################################
Summary:

Detail:

BUG-ID :
Reviewed-by:
Reported-by:
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1350596640 -0600

################################# 80 chars #####################################
# The following is an example of how to fill out the above form. Please limit
# your formatting to 80 cols.
#
# Summary: One line description of commit, followed by blank line
#
# Detail: Multi-line description, followed by blank line
#
# BUG-ID: CLOUDSTACK-9999
# Reviewed-by: Bar Barlington <bar@example.com>, Foo McFooson <foo@example.com>
# Reported-by: Baz Bazelli <baz@example.com>
# Signed-off-by: You <you@yourdomain.com>
#
2012-10-18 15:44:00 -06:00
Jessica Wang
714b0593d3 cloudstack UI - Static NAT, Port Forwarding and Firewall Implementation on JuniperSRX - IP Address page - configuration - if Firewall is provided by JuniperSRX, hide Firewall icon when Port forwarding is configured on IP Address. 2012-10-18 14:41:06 -07:00
Jessica Wang
a8e18f0529 cloudstack UI - Static NAT, Port Forwarding and Firewall Implementation on JuniperSRX - IP Address page - configuration - Firewall - call listNetworkOfferings API only when the screen is navigated from Guest Network section, but not from VPC section. 2012-10-18 14:36:29 -07:00
Jessica Wang
b7ccae0dde cloudstack UI - Static NAT, Port Forwarding and Firewall Implementation on JuniperSRX - IP Address page - configuration - Firewall - exclude ICMP from Protocol dropdown. 2012-10-18 14:35:47 -07:00
Marcus Sorensen
9ba7509c70 Summary: add git prepare-commit-msg file
Detail: CloudStack committers can optionally use this file to prepopulate their
commits with a standard form. The idea was that it would help us get better
commit messages. It is set up locally up by running the following from the root
of the repo:

'ln -s ../../tools/git/prepare-commit-msg .git/hooks/prepare-commit-msg'

Additionally, a different prepare-commit-msg could potentially be committed for
each branch and the link will always point to the one that's checked out.

BUG-ID : none
Reviewed-by: Marcus Sorensen <marcus@betterservers.com>
Reported-by: Rohit Yadav <rohit.yadav@citrix.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1350596087 -0600
2012-10-18 15:34:47 -06:00
Brian Federle
640aba7a77 UI quick view: Fix action state update
Fix case where quick view was removed instead of hidden by a dialog
before performing an action, which casued the list view row to not
update on completion
2012-10-18 12:52:50 -07:00
Brian Federle
acae5f23bc Quickview UI: Localize string 'Quickview'
Conflicts:
	client/WEB-INF/classes/resources/messages.properties
	ui/dictionary.jsp
2012-10-18 11:03:24 -07:00
David Nalley
ca6f1ef7b4 removing CS-15664 as a known issue in release notes - this was resolved months ago 2012-10-18 12:25:08 -04:00
Joe Brockmeier
10cb33bda6 Merge branch 'docs-review'
First pass at release notes. Made several corrections, additions, and updates. Also corrected some incorrect elements, etc.
2012-10-18 09:40:58 -05:00
Joe Brockmeier
44e5a9b445 First pass on the release notes. Corrected a number of issues, partial cleanup of elements. 2012-10-18 09:37:37 -05:00
Rohit Yadav
aa67ec0fb7 INSTALL.md:: Update packaging and installation sections
Update for master. Mostly based on 4.0, we need to fix sections on
packaging.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-10-18 19:36:03 +05:30
Hugo Trippaers
53cea844bc The interface change introduced by commit
214bbf3ebd957f571901869f319da61ebad7ed23 broke the nonoss build.
2012-10-18 09:40:13 +02:00
Prasanna Santhanam
0984f4319a Snapshot related tests moved for speedup
Snapshots take many hours to run because the lowest snapshot period for
testing is an HOURLY snapshot. The component tests are the right place
to run any long running tests. This will also speed up the smoke tests
to under an hour.
2012-10-18 09:42:00 +05:30
David Nalley
bb197ee21c cleaning up about-clusters.xml 2012-10-17 21:57:16 -04:00
David Nalley
1c32024a56 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-10-17 20:38:58 -04:00
David Nalley
3287723d04 cleaning up formatting in cloud-infrastructure-overview 2012-10-17 20:35:41 -04:00
Alena Prokharchyk
214bbf3ebd CLOUDSTACK-279: fixed deleteProject when executed by the regular user. Always pass System account as a caller when do account cleanup
Conflicts:

	api/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java
	server/src/com/cloud/network/element/CiscoNexusVSMElement.java
	server/src/com/cloud/network/element/ElasticLoadBalancerElement.java
	server/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
	server/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
	server/src/com/cloud/network/element/NetscalerElement.java
	server/src/com/cloud/network/element/OvsElement.java
	server/src/com/cloud/network/element/VpcJuniperSRXExternalFirewallElement.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
	server/src/com/cloud/storage/StorageManager.java
2012-10-17 17:26:19 -07:00
David Nalley
2dc1271cdc cleaning up formatting in management-server-overview.xml 2012-10-17 20:25:22 -04:00
David Nalley
a9bf92e404 some install guide cleanup 2012-10-17 20:18:31 -04:00
Jessica Tomechak
c5b8eaf686 Revert "Docs: Add the sections on building from code to the Install Guide. The files were contributed, but never included in the book. This caused a build error as well as missing information."
This reverts commit c8e90158a08beba9b4f54c1acb38ff3f93914abf.
2012-10-17 13:50:16 -07:00
Jessica Tomechak
677498360a Docs: Adding Book_Info back again. Publican requires this file, although it is not obviously being referenced from any of our guides. 2012-10-17 13:02:55 -07:00
Jessica Tomechak
3d56155e43 Docs: Remove book info files which are no longer being used. 2012-10-17 12:46:35 -07:00
Jessica Tomechak
c8e90158a0 Docs: Add the sections on building from code to the Install Guide. The files were contributed, but never included in the book. This caused a build error as well as missing information. 2012-10-17 12:46:32 -07:00
David Nalley
78cf3b268e more release notes cleanup 2012-10-17 15:37:03 -04:00
Jessica Tomechak
c556323b4b Docs: Fixing up hypervisor install sections. Adding hypervisor host system requirements in the correct locations. Partially fixed indentation. 2012-10-17 11:34:12 -07:00
Jessica Tomechak
2bd76f0103 Docs: Fix admin guide build. Adding the Security Groups section to the Install Guide at the same place where it's added in the Admin Guide, rather than at a duplicate place. 2012-10-17 11:34:09 -07:00
David Nalley
d417dd1592 updating the upgrade directions to reflect the new reality 2012-10-17 13:00:01 -04:00
Chip Childers
2ed1c53e0e Adding DISCLAIMER.txt to the marvin tool.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-10-17 12:27:00 -04:00
olivier lamy
fa7dbdf3e9 .gitignore += awsapi/overlays/ 2012-10-17 15:14:57 +02:00
olivier lamy
3cec5a8d4d exclude servlet-api as it prevents tomcat7 plugin to run 2012-10-17 15:14:21 +02:00
olivier lamy
a900f5a370 define version of dependency plugin in parent pom 2012-10-17 15:10:43 +02:00
olivier lamy
45ec07c3fd remove tabs replace with spaces 2012-10-17 15:03:27 +02:00
olivier lamy
9d9e6e57dc fix tomcat plugin configuration 2012-10-17 14:58:02 +02:00
olivier lamy
a6d1ff3328 use released version of tomcat7-maven-plugin 2012-10-17 14:44:20 +02:00
olivier lamy
c56c95923d use last maven war plugin 2012-10-17 14:42:33 +02:00
Hugo Trippaers
28c31e3707 truncate names that are longer than 40 characters, this is the max
length nicira api accepts for display_name.
2012-10-17 13:29:03 +02:00
David Nalley
d4fb02b56a Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-10-17 04:00:35 -04:00
David Nalley
64ff76a647 some release not cleanup 2012-10-17 04:00:13 -04:00
Jessica Tomechak
22b5c0cddd Docs: Fix up grammar and missing text in AWS API compatibility chapter and add it to the Install Guide. 2012-10-17 00:32:01 -07:00
David Nalley
1a18758592 removing more install.sh references 2012-10-17 03:09:53 -04:00
David Nalley
03650def4d cleaning up install docs a bit more 2012-10-17 02:56:06 -04:00
David Nalley
d0f30bfff1 updating some installation instructions 2012-10-17 02:43:05 -04:00
David Nalley
646fd98fc0 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-10-17 02:21:24 -04:00
David Nalley
512501e58a adding content on building packages from source 2012-10-17 02:20:17 -04:00
Jessica Tomechak
a35e23c58f Docs: Add missing file on security groups. 2012-10-16 17:57:46 -07:00
David Nalley
59b77a940f first iteration of source.xml 2012-10-16 20:27:16 -04:00
Alena Prokharchyk
a9fab0526b CLOUDSTACK-348: decrement resource count when the network gets removed
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
2012-10-16 16:18:36 -07:00