Commit Graph

4328 Commits

Author SHA1 Message Date
Bart Van Assche
c7d8a1fa7d Merge r6017 from the iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6277 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:43:08 +00:00
Bart Van Assche
0820ea491c Merge r5995 from the iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6276 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:42:33 +00:00
Bart Van Assche
d1b4a3384b Merge r6088 from the iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6275 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:41:19 +00:00
Bart Van Assche
d844f3c82e Merge r5900 from the iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6274 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:40:40 +00:00
Bart Van Assche
7f1700e263 Merge r5837 from the iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6273 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:39:35 +00:00
Bart Van Assche
c012f4e2f1 Merge r5869 from the iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6272 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:38:43 +00:00
Bart Van Assche
89347d7d6b Merge r5872 from the iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6271 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:38:11 +00:00
Bart Van Assche
928c453a5c Merge r5743 from the iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6270 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:37:21 +00:00
Bart Van Assche
6440794f3d Merge r6000 from the iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6269 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:36:08 +00:00
Bart Van Assche
4710bfd984 Merge r5836 from the iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6268 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:35:18 +00:00
Bart Van Assche
0584116980 Merge r5797 from the iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6267 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:34:34 +00:00
Bart Van Assche
7a652a5e3b Merge r5842 from the iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6266 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:33:49 +00:00
Bart Van Assche
010de6bd43 Merge r5860 from the iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6265 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:32:49 +00:00
Bart Van Assche
a9b0644c96 Merge r5865 from the iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6264 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:29:39 +00:00
Bart Van Assche
bd520b5e23 Merge r5839 from the iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6263 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:27:18 +00:00
Bart Van Assche
c728d4e3af Merge r5870 from the iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6262 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:25:50 +00:00
Bart Van Assche
2bd336549a Finish merging the 3.0.x-iser branch into the 3.0.x branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6261 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:00:22 +00:00
Bart Van Assche
994908e601 Merge r6083 from 3.0.x-iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6260 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:47:59 +00:00
Bart Van Assche
5b0edfd079 Merge r6082 from 3.0.x-iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6259 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:47:42 +00:00
Bart Van Assche
8aa1081442 Merge r6014 from 3.0.x-iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6258 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:47:28 +00:00
Bart Van Assche
26891b58bd Merge r6013 from 3.0.x-iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6257 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:47:15 +00:00
Bart Van Assche
9ac2427ec5 Merge r6012 from 3.0.x-iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6256 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:47:00 +00:00
Bart Van Assche
34ae1e829a Merge r6011 from 3.0.x-iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6255 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:46:44 +00:00
Bart Van Assche
ab31727bcd Merge r6010 from 3.0.x-iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6254 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:46:30 +00:00
Bart Van Assche
716ff53045 Merge r6009 from 3.0.x-iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6253 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:46:15 +00:00
Bart Van Assche
a97d0be047 Merge r6008 from 3.0.x-iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6252 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:46:00 +00:00
Bart Van Assche
7efd9d336b Merge r6007 from 3.0.x-iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6251 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:45:43 +00:00
Bart Van Assche
e52b7a8a89 Merge r6006 from 3.0.x-iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6250 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:45:16 +00:00
Bart Van Assche
4a6806a2af Merge r6005 from 3.0.x-iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6249 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:44:57 +00:00
Bart Van Assche
ec67a69535 Merge r5902 from 3.0.x-iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6248 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:44:32 +00:00
Bart Van Assche
69ea41df6d Merge r5877 from 3.0.x-iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6247 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:44:05 +00:00
Bart Van Assche
8ae0d17a39 Merge r5846 from 3.0.x-iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6246 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:43:37 +00:00
Bart Van Assche
3bcf9d7a02 Merge r5843 from 3.0.x-iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6245 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:43:12 +00:00
Bart Van Assche
8b5061f5f8 Merge r5792 from 3.0.x-iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6244 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:42:55 +00:00
Bart Van Assche
6fe3cb0eba Merge r5782 from 3.0.x-iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6243 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:42:37 +00:00
Bart Van Assche
7cba4ba078 Merge r5742 from 3.0.x-iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6242 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:42:06 +00:00
Bart Van Assche
a5e0e412c0 Finish merging r5663 from 3.0.x-iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6241 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:40:55 +00:00
Bart Van Assche
1536ce4e3b Merge r5742 from 3.0.x-iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6240 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:33:22 +00:00
Bart Van Assche
faae8613ce Merge r5663 from 3.0.x-iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6239 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:32:44 +00:00
Bart Van Assche
ef830f9335 ib_srpt: Avoid that aborting a command triggers a race condition (merge r6181 from trunk)
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6182 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-04-10 17:18:22 +00:00
Bart Van Assche
e9f22173e5 scripts: Merge r6132:6177 from trunk
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6178 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-04-02 14:51:00 +00:00
Vladislav Bolkhovitin
fc51102b1a Boost version numbers
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6143 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-03-11 04:26:28 +00:00
Bart Van Assche
405d9b09fa scripts/generate-release-archive: Include build_mode file in generated archives (merge r6132 from trunk)
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6133 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-02-24 14:37:10 +00:00
Bart Van Assche
90dead9c5c iscsi-scst/usr/Makefile: Fix SCST include path (merge r6130 from trunk)
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6131 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-02-24 14:12:35 +00:00
Bart Van Assche
d9738e6388 Makefile: Add top-level release-archive target (merge r6127 from trunk)
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6129 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-02-24 13:37:57 +00:00
Bart Van Assche
5695df532c scripts/update-version: Add (merge r6126 from trunk)
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6128 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-02-24 13:37:09 +00:00
Bart Van Assche
4f379de39d Version: Update from 3.0.0 into 3.0.1
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6124 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-02-23 13:57:35 +00:00
Bart Van Assche
d2d0d232b2 /etc/init.d/scst: Exit with status code 0 upon start if already running (merge r5912 from trunk)
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6123 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-02-23 13:48:29 +00:00
Bart Van Assche
8330f4c911 Version: Update from 3.0.0 into 3.0.1
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6122 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-02-23 13:47:41 +00:00
Bart Van Assche
79d5b92465 Version: Update from 3.0.0 into 3.0.1
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6121 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-02-23 13:37:42 +00:00