cloudstore-developers

<< < 10 11 12 13 14 > >>

Merge branch 'master' of github.com:CloudScale-Project/Showcase Conflicts: distributed-jmeter/README.md

2/20/2014 1:38:30 PM

Simon Ivanšek

Commit: 95bd9af

Parents: b54530d

Remove large file

3/12/2014 7:09:53 AM

Simon Ivanšek

Commit: b54530d

Parents: 087fef7

Merge branch 'master' of github.com:CloudScale-Project/Showcase

3/12/2014 7:26:15 AM

Simon Ivanšek

Commit: cb1470a

Parents: cc2bdbc
12a8bac

Resolve conflict

2/20/2014 1:39:13 PM

Simon Ivanšek

Commit: 12a8bac

Parents: e80ac2c
a6c0195

Remove config

2/20/2014 8:00:58 AM

Simon Ivanšek

Commit: a6c0195

Parents: 1f21ab1

.gitignore

2/20/2014 7:34:53 AM

Simon Ivanšek

Commit: 1f21ab1

Parents: 74e19f5

Update confi.ini.production Conflicts: distributed-jmeter/conf/confi.ini.production

2/20/2014 7:55:20 AM

Simon Ivanšek

Commit: 74e19f5

Parents: d29525b

Sensetive data Conflicts: distributed-jmeter/conf/confi.ini.production

2/20/2014 7:54:52 AM

Simon Ivanšek

Commit: d29525b

Parents: f250160

Removed sensetive data

2/18/2014 1:39:44 PM

Simon Ivanšek

Commit: f250160

Parents: cb3eb4d

Updated url for dump

2/18/2014 1:37:20 PM

Simon Ivanšek

Commit: cb3eb4d

Parents: be44963