Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-23 20:36:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Adrian Jachacy 2013-06-25 17:12:26 +01:00
commit 58e187d981
4 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

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

6
mk/bumpBuildNumber.sh
View File

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

13
mk/id_dsa
View File

@ -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-----

1
mk/id_dsa.pub
View File

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