Merge branch 'master' of git://hg.uk.xensource.com/carbon/trunk/xenadmin

.gitignore

@@ -16,8 +16,6 @@ NUnit
 obj
 xml-rpc.net
 sharpziplib
-Amazon.EC2
-Amazon.SimpleDB
 XenServer.NET/*
 Thumbs.db
 *-listing.txt
@@ -27,7 +25,6 @@ Thumbs.db
 *.bak
 splash/Release/*
 Installer/Release/*
-XenAdmin/Help/docgen/*
 WixInstaller/wixlib/*
 WixInstaller/outXenCenter*
 WixInstaller/*.mst
@@ -41,8 +38,6 @@ WixInstaller/XenCenter.l10n.wxs
 XenOvfApi/External Tools/bootablereference.vhd.bz2
 sign.bat
 XenServer-SDK.zip
-regexp:ReSharper
-regexp:Javier
+_ReSharper.*/
 glob:Nunit/nunit.framework.dll
 glob:XenOvfApi/External Tools/xenserver-linuxfixup-disk.iso
-glob:BouncyCastle/BouncyCastle.Crypto.dll

mk/bumpBuildNumber.sh

@@ -47,11 +47,7 @@ else
   exit 1
 fi
 
-ssh_key="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/id_dsa"
-
-chmod 600 ${ssh_key}
-
-PSQL="ssh -i ${ssh_key} -q xenbuild@xenbuilder.uk.xensource.com PGPASSWORD=xenadmindb psql -q -A -t xenbuilder xenadmin"
+PSQL="ssh -q xenbuild@xenbuilder.uk.xensource.com PGPASSWORD=xenadmindb psql -q -A -t xenbuilder xenadmin"
 
 QUERY="""INSERT INTO xenadmin_builds (build_number,job,revision) SELECT ${get_BUILD_NUMBER},'${get_JOB_NAME}','${get_GIT_REVISION}' WHERE NOT EXISTS ( SELECT 1 FROM xenadmin_builds WHERE build_number = ${get_BUILD_NUMBER});
 UPDATE xenadmin_builds SET job='${get_JOB_NAME}',revision='${get_GIT_REVISION}' WHERE build_number=${get_BUILD_NUMBER};

mk/id_dsa

@@ -1,13 +0,0 @@
------BEGIN DSA PRIVATE KEY-----
-MIIBvAIBAAKBgQD1Sr813H79RUCbbz4p9rISrHprO+k6e9qMfCTETWfN4DGkstms
-j16DxgOX2dbb8wowfbl7WXQ6Ogby1Adtz+eR8kRTA3UVXTl4MV6nsX4zcwes6A9r
-jY/G0JsE2N+almxSqMYPWl4zKjekw9YW5LOadDYcreOjgaJ4a+ORLI0G2QIVANwl
-SizleAyQDT3R7rr7Z6muKeZXAoGBAPUujHkHpAFAA4cx47lpVifecZ625ML/kPcy
-jnuI4es7xSl0MzSBgLOGRohMzy/OcHCA3jUI6lnohdGoLT3a3Q+QdLAaBmKTU7SK
-zxrTwHAen3hjHPXQ1svB8iDoOjq1QIJEJEwkSml8e8FlsZNSiQdq5GBPHtPSPlvk
-ywUp2kJFAoGAH2AiHfv0XEGETJmLsefQFq0bsYxfYxfds9Kki/iuK683yOLH/lpI
-ojjKP3OG21ERAnEmYocqG5aNwu1F6orAuWje9xcyV7yMuJpTkIZQKyuIefkejtVr
-/raP7+KwweMRqjPxew1YT2TT8Bd0sf0ayClKpj4p5WOoi9Jkk8NkxiwCFQCJ3i1o
-l062X8O7IY2sfR1vBVkyaw==
------END DSA PRIVATE KEY-----
- 

mk/id_dsa.pub

@@ -1 +0,0 @@
-ssh-dss AAAAB3NzaC1kc3MAAACBAPVKvzXcfv1FQJtvPin2shKsems76Tp72ox8JMRNZ83gMaSy2ayPXoPGA5fZ1tvzCjB9uXtZdDo6BvLUB23P55HyRFMDdRVdOXgxXqexfjNzB6zoD2uNj8bQmwTY35qWbFKoxg9aXjMqN6TD1hbks5p0Nhyt46OBonhr45EsjQbZAAAAFQDcJUos5XgMkA090e66+2eprinmVwAAAIEA9S6MeQekAUADhzHjuWlWJ95xnrbkwv+Q9zKOe4jh6zvFKXQzNIGAs4ZGiEzPL85wcIDeNQjqWeiF0agtPdrdD5B0sBoGYpNTtIrPGtPAcB6feGMc9dDWy8HyIOg6OrVAgkQkTCRKaXx7wWWxk1KJB2rkYE8e09I+W+TLBSnaQkUAAACAH2AiHfv0XEGETJmLsefQFq0bsYxfYxfds9Kki/iuK683yOLH/lpIojjKP3OG21ERAnEmYocqG5aNwu1F6orAuWje9xcyV7yMuJpTkIZQKyuIefkejtVr/raP7+KwweMRqjPxew1YT2TT8Bd0sf0ayClKpj4p5WOoi9Jkk8Nkxiw= sorin@sPro.local