vishalseshagiri
b1c218e0b1
Merge pull request #20 from frappe/develop
...
merge develop into master
2017-11-27 12:46:04 +05:30
vishalseshagiri
6bf6927deb
Updated dbench
...
- changed default site on bench init from bench-manager.local to site1.local
- dbench init by default installs erpnext now
2017-11-27 12:44:49 +05:30
vishalseshagiri
1a24453af8
Merge pull request #18 from africlouds/hotfixes
...
Fixed mariadb ports mapping
2017-10-26 09:44:03 +05:30
vishalseshagiri
a6da129cbd
Update README.md
2017-10-09 09:44:06 +05:30
vishalseshagiri
bbb1759fd9
Merge pull request #16 from frappe/develop
...
Develop
2017-10-09 09:43:32 +05:30
vishalseshagiri
641c4a08ac
changed travis badge
2017-10-09 09:38:54 +05:30
vishalseshagiri
c3c639dd35
Merge pull request #15 from vishalseshagiri/develop
...
dbench init added + travis errors fixed
2017-10-09 09:38:06 +05:30
vishalseshagiri
f4a52d8746
Update README.md
2017-10-09 09:35:51 +05:30
pzdge23
89654cf580
fixing travis build error
2017-10-09 09:23:42 +05:30
pzdge23
656386c44b
added init option
2017-10-09 08:45:52 +05:30
Aimable Rwema
a34106b23b
Fixed mariadb ports mapping
2017-10-08 06:50:56 +02:00
vishalseshagiri
643dd4b4ce
Update Dockerfile
2017-10-06 13:55:55 +05:30
vishalseshagiri
7e9abdc738
Update Dockerfile
2017-10-06 13:53:48 +05:30
vishalseshagiri
247f82ae0b
Update README.md
...
Former-commit-id: b5a5fc6618
2017-10-02 09:48:51 +05:30
vishalseshagiri
41bc6d6164
Update dbench
...
Added -s flag to dbench
Former-commit-id: 2b1530e523
2017-10-02 09:48:51 +05:30
Karl G
51ded701ed
fixing various issues with dbench
...
- Added missing shebang
- Fixed malformed multi line variables
- Removed unnecessary su (which is not working in this way anyway)
- Added missing error handling (unsupported options as well as missing argument)
- Simplified the whole script (without the removal of features, hopefully?)
Former-commit-id: 33cc4ff3a0
2017-10-02 09:48:51 +05:30
vishalseshagiri
d3c3c52a27
Updated Readme
...
Former-commit-id: 935fbb72cb
2017-10-02 09:48:51 +05:30
vishalseshagiri
7cf16223ff
Update README.md
...
Former-commit-id: fa8e80fe3e
2017-10-02 09:48:51 +05:30
vishalseshagiri
f1d67b2152
Update README.md
...
Former-commit-id: e9ba15a12a
2017-10-02 09:48:51 +05:30
vishalseshagiri
d850abd658
Rename LICENSE to LICENSE.md
...
Former-commit-id: 5c58bd720b
2017-10-02 09:48:51 +05:30
vishalseshagiri
6413ecfc20
Delete LICENSE.md
...
Former-commit-id: 62678031d6
2017-10-02 09:48:51 +05:30
vishalseshagiri
cc21ccfe2e
Create LICENSE
...
Former-commit-id: 9bd9087d16
2017-10-02 09:48:51 +05:30
vishalseshagiri
f385cde5d9
Update README.md
...
Former-commit-id: 7fd94ca8bc
2017-10-02 09:48:51 +05:30
vishalseshagiri
ac115c2ff7
added file-watcher-port and socketio-port + Readme changes
...
Former-commit-id: 34f60750dc
2017-10-02 09:48:51 +05:30
vishalseshagiri
30bfe369ec
updated README.md
...
Former-commit-id: 2a3a449863
2017-10-02 09:48:51 +05:30
vishalseshagiri
662aa6562f
global r
...
Former-commit-id: 1f2e8eb0e8
2017-10-02 09:48:51 +05:30
vishalseshagiri
94ecd0f69e
changes to test and travis.yml
...
Former-commit-id: 39828590e7
2017-10-02 09:48:51 +05:30
vishalseshagiri
67477a1adc
converted pip and python to pip3 and python3
...
Former-commit-id: 81cdd24cb6
2017-10-02 09:48:51 +05:30
vishalseshagiri
e308b8717f
removed pip install time from .travis.yml
...
Former-commit-id: 5cb5b92154
2017-10-02 09:48:51 +05:30
vishalseshagiri
58244ae233
Removed docker-exec from travis and shifted to test.py
...
Former-commit-id: 236ff05ca5
2017-10-02 09:48:51 +05:30
vishalseshagiri
5f6e0fc104
amended commit
...
Former-commit-id: fa2b54c67c
2017-10-02 09:48:51 +05:30
vishalseshagiri
dc5add7526
mend
...
Former-commit-id: e5ee9da08c
2017-10-02 09:48:51 +05:30
vishalseshagiri
2e38d7d921
mend
...
Former-commit-id: 12685970e8
2017-10-02 09:48:51 +05:30
vishalseshagiri
01a56f6a77
mend
...
Former-commit-id: 3d081fb054
2017-10-02 09:48:51 +05:30
vishalseshagiri
372940696e
mend
...
Former-commit-id: 6eebe2c38a
2017-10-02 09:48:51 +05:30
vishalseshagiri
6b71c86090
Fixed the permissions issue in travis.yml
...
Former-commit-id: 8d380f2e4a
2017-10-02 09:48:51 +05:30
vishalseshagiri
875d88adcd
shifted docker-exec from script to install in travis.yml
...
Former-commit-id: d3fce5cec0
2017-10-02 09:48:51 +05:30
vishalseshagiri
fbf13bbc2e
Added bench init , start and python tests to curl the site
...
Former-commit-id: 3f148638fb
2017-10-02 09:48:47 +05:30
vishalseshagiri
9d1d09a3c0
changed mariadb ports to 3307
...
Former-commit-id: 06ff744f7b
2017-10-02 09:45:46 +05:30
vishalseshagiri
d73059b753
Added pkill mysqld
...
Former-commit-id: 50d223eb6d
2017-10-02 09:45:46 +05:30
vishalseshagiri
ebbcb24141
Update README.md
...
Former-commit-id: 9dbd140a72
2017-10-02 09:45:46 +05:30
vishalseshagiri
d1beca6939
Added env: - DOCKER_COMPOSE_VERSION: 1.8.0
...
Former-commit-id: 36eb7ba832
2017-10-02 09:45:46 +05:30
vishalseshagiri
d8fa93fd3f
travis errors rectified
...
Former-commit-id: 6c605852e4
2017-10-02 09:45:46 +05:30
vishalseshagiri
950647a182
git diff bb01cc8277 a32c9230dd726399c59f5849d7e0a25b1e3a281a | git apply --reject --whitespace=fix
2017-10-02 09:32:03 +05:30
vishalseshagiri
bb01cc8277
Merge pull request #8 from vishalseshagiri/development
...
Merge pull request #7 from vishalseshagiri/master
Former-commit-id: f04cddcd63
2017-07-25 09:33:41 +05:30
vishalseshagiri
23a2b51a5f
Update README.md
...
Former-commit-id: f4eb01f58d
2017-07-25 09:32:59 +05:30
vishalseshagiri
757e20272e
Update README.md
...
Former-commit-id: c6df5de79f
2017-07-25 09:31:01 +05:30
vishalseshagiri
c78cb53952
Update README.md
...
Former-commit-id: 9569cbe819
2017-07-25 09:28:49 +05:30
vishalseshagiri
8f40ff5003
Rename enter-docker.sh to docker-enter.sh
...
Former-commit-id: 5f40e896c3
2017-07-25 09:27:27 +05:30
vishalseshagiri
260ef491de
Update README.md
...
Former-commit-id: 8ec1b10981
2017-07-24 18:35:01 +05:30
