From b104bbb511d6b0a10c5438590b51b9d1b40ce9d4 Mon Sep 17 00:00:00 2001
From: Chiradeep Vittal <chiradeep@cloud.com>
Date: Tue, 17 Aug 2010 11:09:12 -0700
Subject: [PATCH 1/2] ignore override and bin and logfiles properly

---
 .gitignore | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index df8c2ae5163..032a9e806ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,15 @@
 build/build.number
-bin
+bin/
 cloudstack-proprietary
 .lock-wscript
 artifacts
 .waf-*
 waf-*
 target
-override
+override/
 .metadata
 dist
 *~
 *.bak
 cloud-*.tar.bz2
+*.log

From 1849d4a6b118588fc2b1a5efd73f5a9a3cc42796 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 17 Aug 2010 14:05:38 -0700
Subject: [PATCH 2/2] Issue #: 5894 Create Template from Snapshot dialog - add
 password dropdown field

---
 ui/content/tab_storage.html      |  9 ++++++++-
 ui/scripts/cloud.core.storage.js | 12 +++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ui/content/tab_storage.html b/ui/content/tab_storage.html
index 2250ebddacd..90c75b95dba 100644
--- a/ui/content/tab_storage.html
+++ b/ui/content/tab_storage.html
@@ -1516,7 +1516,14 @@
 					<label>OS Type:</label>
 					<select class="select" id="os_type">
 					</select>
-				</li>				
+				</li>		
+				<li>
+					<label>Password Enabled?:</label>
+					<select class="select" id="password">						
+						<option value="false">No</option>
+						<option value="true">Yes</option>
+					</select>
+				</li>
 			</ol>
 		</form>
 	</div>
diff --git a/ui/scripts/cloud.core.storage.js b/ui/scripts/cloud.core.storage.js
index 8d3434fa7fe..028c541535c 100644
--- a/ui/scripts/cloud.core.storage.js
+++ b/ui/scripts/cloud.core.storage.js
@@ -16,7 +16,7 @@
  * 
  */
 
-// Version: 1.9.1.452
+// Version: @VERSION@
 
 function showStorageTab(domainId, targetTab) {      
     var currentSubMenu;
@@ -531,7 +531,8 @@ function showStorageTab(domainId, targetTab) {
 	                         
 	                         var name = thisDialog.find("#name").val();	 
 	                         var displayText = thisDialog.find("#display_text").val();	 
-	                         var osTypeId = thisDialog.find("#os_type").val(); 	                                           
+	                         var osTypeId = thisDialog.find("#os_type").val(); 	  
+	                         var password = thisDialog.find("#password").val();	                                         
 	                         thisDialog.dialog("close");	
 	                         		     	                                                         	                                                  						
 							 var loadingImg = template.find(".adding_loading");							
@@ -541,7 +542,7 @@ function showStorageTab(domainId, targetTab) {
 				             rowContainer.hide(); 	                                  
 	                                                    
 	                         $.ajax({
-					                 data: createURL("command=createTemplate&snapshotid="+snapshotId+"&name="+name+"&displaytext="+displayText+"&ostypeid="+osTypeId+"&response=json"),
+					                 data: createURL("command=createTemplate&snapshotid="+snapshotId+"&name="+name+"&displaytext="+displayText+"&ostypeid="+osTypeId+"&passwordEnabled="+password+"&response=json"),
 						         dataType: "json",
 						         success: function(json) {							            					           								 
 							        var jobId = json.createtemplateresponse.jobid;					        
@@ -1596,7 +1597,8 @@ function showStorageTab(domainId, targetTab) {
 	                         
 	                         var name = thisDialog.find("#name").val();	 
 	                         var displayText = thisDialog.find("#display_text").val();	 
-	                         var osTypeId = thisDialog.find("#os_type").val(); 	                                           
+	                         var osTypeId = thisDialog.find("#os_type").val(); 	
+	                         var password = thisDialog.find("#password").val();		                                           
 	                         thisDialog.dialog("close");	
 	                         		     	                                                         	                                                  						
 							 var loadingImg = template.find(".adding_loading");							
@@ -1606,7 +1608,7 @@ function showStorageTab(domainId, targetTab) {
 				             rowContainer.hide(); 	                                  
 	                                                    
 	                         $.ajax({
-					                 data: createURL("command=createTemplate&snapshotid="+snapshotId+"&name="+name+"&displaytext="+displayText+"&ostypeid="+osTypeId+"&response=json"),
+					                 data: createURL("command=createTemplate&snapshotid="+snapshotId+"&name="+name+"&displaytext="+displayText+"&ostypeid="+osTypeId+"&passwordEnabled="+password+"&response=json"),
 						         dataType: "json",
 						         success: function(json) {							            					           								 
 							        var jobId = json.createtemplateresponse.jobid;