bitmask.git/Leapfile, branch deploytests/singlenode [bitmask] removed @platform_branch=develop, cause it blocks me from deploying a different feature branch. please put this paramter in your individual ~/.leaprc 2014-01-13T20:40:30+00:00 varac varacanero@zeromail.org 2014-01-13T20:40:30+00:00 f1245090296a54c5272882f1cac85d7912650109 






Merge branch 'develop'
2013-11-24T11:30:07+00:00

kwadronaut
kwadronaut@leap.se

2013-11-24T11:30:07+00:00

ff44bc75b814700f65459f990bfb6c078c876483

Conflicts:
	Leapfile
	files/ssh/authorized_keys





Conflicts:
	Leapfile
	files/ssh/authorized_keys







removed @platform_branch pinning in develop branch, cause it breaks developing if you're on a different branch
2013-03-14T14:39:40+00:00

varac
varacanero@zeromail.org

2013-03-14T14:39:40+00:00

9b161b9aebcb1d7c5c5beaa4b8c4ee904f1da822












changed @platform_directory_path to be '../leap_platform'
2013-03-13T09:34:47+00:00

elijah
elijah@riseup.net

2013-03-13T09:34:47+00:00

8779825815ad8710e0a1f125c5b5bf94a6e3a445












Revert "include @platform_branch = develop"
2013-03-07T14:58:26+00:00

varac
varacanero@zeromail.org

2013-03-07T14:58:16+00:00

ed4f6de54da55b73692e4d16109481dd60b40667

This reverts commit 092493487fca352d7052701e37d034383f0d84b5.

Otherwise you can't develop on a different branch than develop.





This reverts commit 092493487fca352d7052701e37d034383f0d84b5.

Otherwise you can't develop on a different branch than develop.







include @platform_branch = develop
2013-03-07T14:19:39+00:00

varac
varacanero@zeromail.org

2013-03-07T14:19:39+00:00

092493487fca352d7052701e37d034383f0d84b5












include @platform_branch = master
2013-03-07T14:18:55+00:00

varac
varacanero@zeromail.org

2013-03-07T14:18:55+00:00

ab4834cbb571e35238726b0bd9c8571ccd87aee3












Leapfile: use ../leap_platform_develop for development branch
2013-03-06T17:29:33+00:00

varac
varacanero@zeromail.org

2013-03-06T17:29:33+00:00

eef741a300e5d0209e2e591efac0002976051df2












Leapfile: enable logging, point to ../leap_platform_master
2013-03-06T15:09:26+00:00

varac
varacanero@zeromail.org

2013-03-06T15:09:26+00:00

42c693abe5519b906cdb6f85004a8405080c417b












moved Leapfile and .gitignore too.
2013-02-26T23:04:36+00:00

elijah
elijah@riseup.net

2013-02-26T23:04:36+00:00

f694176bcd5fbc28e55a64e59e0b4a864121a249