Commit graph

1828 commits

Author SHA1 Message Date
Dustin Johnson
9f2c0db712 Issue #1412 Add common useradmin code to PDE build for EDEX
Change-Id: I5d676ff43dbe89c2e6a2f48e373704cbf38e42bc

Former-commit-id: 6cc28be958 [formerly ede32c8d3e] [formerly 6cc28be958 [formerly ede32c8d3e] [formerly f316320b06 [formerly 39d60f23ea246e17924c78562c45cc0b6491a53d]]]
Former-commit-id: f316320b06
Former-commit-id: f274ce63e9 [formerly 35409872a6]
Former-commit-id: adc46ddeef
2013-01-11 08:56:39 -06:00
Richard Peter
9312478e41 Merge "Issue #1432 - Fix case sensative and exclude check boxes." into development
Former-commit-id: 942140cca5 [formerly cffe035019] [formerly 942140cca5 [formerly cffe035019] [formerly e91b5bd035 [formerly 8da35969c383bb7d22e5f629859311d8783069dc]]]
Former-commit-id: e91b5bd035
Former-commit-id: c4c2ae3256 [formerly 6857211fc6]
Former-commit-id: 9492e77036
2013-01-10 17:25:09 -06:00
Richard Peter
4552b5f71a Issue #1454: Update Dataset size calculation
Change-Id: I5653bc1614945fb0dad2eec757e1de0831b809d5

Former-commit-id: 45e6e286bb [formerly deca70207d] [formerly 45e6e286bb [formerly deca70207d] [formerly 73263e270e [formerly 345344ed47305bc0698eec29cbae7e7922378cc7]]]
Former-commit-id: 73263e270e
Former-commit-id: 4a097586f6 [formerly 69818573a6]
Former-commit-id: 49da28ead4
2013-01-10 17:17:58 -06:00
Mike Duff
d23c9266d8 Issue #1432 - Fix case sensative and exclude check boxes.
Former-commit-id: d2981a8275 [formerly 9526199a9c] [formerly d2981a8275 [formerly 9526199a9c] [formerly 78440f2b5a [formerly 29d620050a3b2aefd2b9eda664e3139e146558be]]]
Former-commit-id: 78440f2b5a
Former-commit-id: f2da1df6e6 [formerly bde6be532e]
Former-commit-id: ae8eecc95b
2013-01-10 15:35:33 -06:00
Mike Duff
7b76dbba46 Issue #1346 - added addtional information to the data browser dataset details dialog
Former-commit-id: 674ddfedb2 [formerly 02bfe05a27] [formerly 674ddfedb2 [formerly 02bfe05a27] [formerly b72c2e4b04 [formerly 682e4831f76b3a220aeedb9fc292886f24582e72]]]
Former-commit-id: b72c2e4b04
Former-commit-id: 8b23902cea [formerly b42395d6ea]
Former-commit-id: 910401bd23
2013-01-10 12:26:59 -06:00
Dustin Johnson
c1988cbf3f Merge "Issue #1441 Break net.dods dependency on AWIPS code" into development
Former-commit-id: 5a861267aa [formerly 7d67bd5949] [formerly 5a861267aa [formerly 7d67bd5949] [formerly d5fcc68163 [formerly 45b7e01839ef90c8623c3c5b8f2c873997e90111]]]
Former-commit-id: d5fcc68163
Former-commit-id: 048606bae5 [formerly c6609e8ea8]
Former-commit-id: f1161422d7
2013-01-10 12:25:04 -06:00
Dustin Johnson
24d1f60c83 Issue #1441 Break net.dods dependency on AWIPS code
Change-Id: I13289bff3f3ea80317a858f8a32cc280b1ac0480

Former-commit-id: 3ebe0cf1ca [formerly ddcc816bba] [formerly 3ebe0cf1ca [formerly ddcc816bba] [formerly c00f5f394a [formerly 010eabebb27f6a2571ffb2a09e1715cb84c57ce9]]]
Former-commit-id: c00f5f394a
Former-commit-id: 59a209e77d [formerly c29d2e2e71]
Former-commit-id: 4aa7257146
2013-01-10 12:06:39 -06:00
Ron Anderson
d7fbeb15d7 Merge "Issue #1395 Fixed dynamic update of opacity." into development
Former-commit-id: bbc314f50c [formerly 9d3405dd68] [formerly bbc314f50c [formerly 9d3405dd68] [formerly 001bdc84b9 [formerly f3a9eed298a3b776f8b2b83416e8f98981d92912]]]
Former-commit-id: 001bdc84b9
Former-commit-id: cd33ded3e7 [formerly c0e80aa175]
Former-commit-id: 9464c329e9
2013-01-10 11:40:43 -06:00
Richard Peter
c8c4f68603 Merge "Issue #1420 - Rules Peer review comments" into development
Former-commit-id: 206ffc0e15 [formerly 507a3d641c] [formerly 206ffc0e15 [formerly 507a3d641c] [formerly c0e712f682 [formerly eded38dc13847cc764bcc4cb71997b8abb685c89]]]
Former-commit-id: c0e712f682
Former-commit-id: 9524f5a52b [formerly 9543d23d23]
Former-commit-id: 6dbbf56c1d
2013-01-10 10:51:28 -06:00
Nate Jensen
3fff3b0d0b Merge "Issue #1467 - updated the memory settings for 64-bit GFE" into development
Former-commit-id: d02e1ff0a7 [formerly a3e10f6dcd] [formerly d02e1ff0a7 [formerly a3e10f6dcd] [formerly 62f89e6189 [formerly 5f262d2cb46ad8ff0ec355e64ee73b6deb7ed454]]]
Former-commit-id: 62f89e6189
Former-commit-id: ef3468acd4 [formerly 5733a44770]
Former-commit-id: 4d91741212
2013-01-10 10:31:05 -06:00
Richard Peter
a9a245dfe2 Merge "Issue #1412 User Admin dialog should refresh with changes made to authentication data" into development
Former-commit-id: e1547982b0 [formerly ee6513bad3] [formerly e1547982b0 [formerly ee6513bad3] [formerly 2d1a6c4833 [formerly 5f26573ba4c0881e1ee6c7a4809f9465589164a1]]]
Former-commit-id: 2d1a6c4833
Former-commit-id: 27a06e14b8 [formerly 46faa0f68d]
Former-commit-id: 58a28b4193
2013-01-10 10:18:39 -06:00
Ron Anderson
b6bb0a5319 Issue #1395 Fixed dynamic update of opacity.
Change-Id: Ic552a759c23035dfe2d830323d4dbe170e0d0187

Former-commit-id: 37d6ed5232 [formerly 145665c496] [formerly 37d6ed5232 [formerly 145665c496] [formerly 3df3cf7f7b [formerly cae505a088e959670f4cacb92e439a82f13559b9]]]
Former-commit-id: 3df3cf7f7b
Former-commit-id: 2c364744bb [formerly 1f298b87b5]
Former-commit-id: d855e9ada0
2013-01-10 10:00:56 -06:00
Richard Peter
e81e4c0593 Merge "Issue #1465 fix import derived parameter." into development
Former-commit-id: 856959f0d5 [formerly 9293a7e3f7] [formerly 856959f0d5 [formerly 9293a7e3f7] [formerly 86f5fec292 [formerly cfc04313c76c75db5a5bd7bc1bd32577a4615974]]]
Former-commit-id: 86f5fec292
Former-commit-id: fa41b57e14 [formerly 68f8878d4f]
Former-commit-id: 5e75d7409e
2013-01-10 09:35:16 -06:00
Richard Peter
398b47967d Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: d0a6ba23e5 [formerly 029ebaa63a] [formerly d0a6ba23e5 [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]
Former-commit-id: 328be6ac2b
Former-commit-id: 80bf1d7a28 [formerly 6a5a0d7d09]
Former-commit-id: 709af3b25e
2013-01-09 17:55:05 -06:00
Ron Anderson
afef7ce174 Issue #1468 Make DataStoreResource update labels when magnification is changed.
Change-Id: I1337db46d620aba6cc8939f4f42b25322dc81a98

Former-commit-id: 56364be3ce [formerly 3acf0edad0] [formerly 56364be3ce [formerly 3acf0edad0] [formerly 5918458b70 [formerly 473cfc2dbd3406a1602f84daf1ca320228b3b1ed]]]
Former-commit-id: 5918458b70
Former-commit-id: 65327a9221 [formerly 0476d4ccc6]
Former-commit-id: 19b6b94e67
2013-01-09 15:52:08 -06:00
Dustin Johnson
d4d1a95461 Issue #1412 User Admin dialog should refresh with changes made to authentication data
Change-Id: I407dc061a50bf30cb2b37a5fa3b1fe8c5e63ce23

Former-commit-id: bad7b754e5 [formerly b7ed75896b] [formerly bad7b754e5 [formerly b7ed75896b] [formerly a354bac4da [formerly 5e89b4f6c1cbb9db68b5ac185ba09ca5a6543e3b]]]
Former-commit-id: a354bac4da
Former-commit-id: 424a70dbfe [formerly 0d5bb5ba95]
Former-commit-id: 09a33ab8ac
2013-01-09 15:40:36 -06:00
Bryan Kowal
b6ceffe69a Issue #1467 - updated the memory settings for 64-bit GFE
Change-Id: I40df3faed89bd23c5e37b81f3a4e6b256b5a2cc3

Former-commit-id: 6129a00225 [formerly 0645a9fe40] [formerly 6129a00225 [formerly 0645a9fe40] [formerly 73bdd66283 [formerly 2d6bf1e42cb628a5b5af6a261202d01c7fa236fb]]]
Former-commit-id: 73bdd66283
Former-commit-id: 777b804edc [formerly e9dd794082]
Former-commit-id: 4f1a822578
2013-01-09 13:03:38 -06:00
Ben Steffensmeier
8d6310adfb Issue #1465 fix import derived parameter.
Former-commit-id: c0ea76eb90 [formerly 6a2b73b816] [formerly c0ea76eb90 [formerly 6a2b73b816] [formerly a9ece85f9b [formerly fb133aac1ba6013e826ff38a29f5f1720127aa53]]]
Former-commit-id: a9ece85f9b
Former-commit-id: 0df360a83a [formerly d7c2668b88]
Former-commit-id: 7a693e3f66
2013-01-09 12:04:00 -06:00
Mike Duff
660064ea6a Issue #1420 - Rules Peer review comments
Former-commit-id: f41d525fa3 [formerly 4c63333a96] [formerly f41d525fa3 [formerly 4c63333a96] [formerly 6e0367cdc7 [formerly 9f6756325c5788dd1b98d8f24ab3437993da7dcd]]]
Former-commit-id: 6e0367cdc7
Former-commit-id: ed95eae2e3 [formerly 67486aa43b]
Former-commit-id: 8313877a3a
2013-01-09 12:02:21 -06:00
Ben Steffensmeier
1b9a9383c1 Issue #1362 add null chack in nsharp mouse handler.
Former-commit-id: b05bf7b6e2 [formerly 1186724fa8] [formerly b05bf7b6e2 [formerly 1186724fa8] [formerly a836aee481 [formerly 4ae38765c9a6815050d30b307b4a364b617c49aa]]]
Former-commit-id: a836aee481
Former-commit-id: a8b4746176 [formerly 3a4661685a]
Former-commit-id: 8fb09ab2cb
2013-01-08 18:17:24 -06:00
Richard Peter
920867e5cd Merge "Issue #1299 Log if invalid forecast index is requested" into development
Former-commit-id: c29aad09b2 [formerly c138f7b351] [formerly c29aad09b2 [formerly c138f7b351] [formerly b43a21f4b5 [formerly 5eef3aa833a8940435fe965e060501e27a6c5eec]]]
Former-commit-id: b43a21f4b5
Former-commit-id: 27356fb873 [formerly 42848170a9]
Former-commit-id: 189254a1dc
2013-01-08 16:48:09 -06:00
Richard Peter
300868ac56 Merge "Issue #1438 do not log grib ingest" into development
Former-commit-id: fe14e7eeba [formerly 3386fee25a] [formerly fe14e7eeba [formerly 3386fee25a] [formerly 6e54eea341 [formerly f63acd39e8a303be5725c6a1c5e5a6fa0b942c05]]]
Former-commit-id: 6e54eea341
Former-commit-id: 54bce1bbd0 [formerly a840a6bed4]
Former-commit-id: ff7d27a295
2013-01-08 16:47:24 -06:00
Richard Peter
6eed9166d7 Merge "Issue #1436 Fixed selection icon reset, Fixed area text box display check." into development
Former-commit-id: 6b2edffd7e [formerly f25f22c569] [formerly 6b2edffd7e [formerly f25f22c569] [formerly 6a54b7f4d3 [formerly 26e37784cac5ffd690e7280aa394711a3bd86820]]]
Former-commit-id: 6a54b7f4d3
Former-commit-id: 7b4c0a6750 [formerly 34bc572bb9]
Former-commit-id: e97eead930
2013-01-08 16:45:58 -06:00
Richard Peter
d9f19bfc7b Merge "Issue #1453 Fix the handling of subscription active period dates." into development
Former-commit-id: dc57c5a282 [formerly fd4d8f2407] [formerly dc57c5a282 [formerly fd4d8f2407] [formerly dcbda78944 [formerly f8edc8238c8e2e115cd776b294c66e572bf00cc6]]]
Former-commit-id: dcbda78944
Former-commit-id: fdc4ebb5b5 [formerly 605c8dfe77]
Former-commit-id: 13ff9f1cb1
2013-01-08 16:44:56 -06:00
Ben Steffensmeier
30a076a1b7 Issue #1438 do not log grib ingest
Former-commit-id: b7b5f2e22f [formerly 1c5f61bf33] [formerly b7b5f2e22f [formerly 1c5f61bf33] [formerly 36ce3e2df9 [formerly f2c0fb9ec75271d5c277e8c93da3848a455518fb]]]
Former-commit-id: 36ce3e2df9
Former-commit-id: cc9922a697 [formerly 0c675d3deb]
Former-commit-id: 6b8ee10c24
2013-01-08 15:50:47 -06:00
Dustin Johnson
9368311f93 Issue #1299 Log if invalid forecast index is requested
Change-Id: If550175be76c99a90acd228dc8f4542fb39ee644

Former-commit-id: 2e8172899c [formerly cb9a603da8] [formerly 2e8172899c [formerly cb9a603da8] [formerly d3f2a7a19e [formerly 30b3c809902e82b40855ddf31f2c6faecf59f861]]]
Former-commit-id: d3f2a7a19e
Former-commit-id: 8b42d8aa2e [formerly 004bad506d]
Former-commit-id: a06204192f
2013-01-08 14:51:53 -06:00
Brad Gonzales
2dfc5f99c5 Issue #1436 Fixed selection icon reset, Fixed area text box display check.
Change-Id: Ib7545ff9e23eadac26daf927ce428b805f3be4b2

Former-commit-id: 701c572625 [formerly c9c68424f9] [formerly 701c572625 [formerly c9c68424f9] [formerly a78c49e2b1 [formerly 4fb8c74153e6da96943cf6ee71b03f5c3ff73176]]]
Former-commit-id: a78c49e2b1
Former-commit-id: 21e8f98ee8 [formerly 5a5644a2c5]
Former-commit-id: 720a30f639
2013-01-08 14:12:22 -06:00
Ben Steffensmeier
01d205d179 Issue #1438 change string null to be converted to null always.
Change-Id: I4dfdc681f339c1f7552aae27113f1cbe6e5584e7

Former-commit-id: d5c6061ffc [formerly 0659a127ff] [formerly d5c6061ffc [formerly 0659a127ff] [formerly 8421469229 [formerly 12de9bf8bab68ee225a7b31d02c556ad3605aad6]]]
Former-commit-id: 8421469229
Former-commit-id: b911356a64 [formerly 79474382d2]
Former-commit-id: a99267dd11
2013-01-08 12:56:46 -06:00
Dustin Johnson
b24ddaeb4e Issue #1453 Fix the handling of subscription active period dates.
Amend:
  Move tests project over that was missed while moving datadelivery code

Change-Id: I10611f8a4b6c2efe6af1813e5181fadc059e4f9a

Former-commit-id: 1975cd0442 [formerly 6a90779214] [formerly 1975cd0442 [formerly 6a90779214] [formerly 2635e05723 [formerly 0e1397db6ca1a7a577d20507bc2c4daf823188fe]]]
Former-commit-id: 2635e05723
Former-commit-id: 885f315d30 [formerly 492cee4992]
Former-commit-id: b1c159fc7f
2013-01-08 12:44:29 -06:00
Steve Harris
4f75e85c8f Merge "Issue #1459 fix interp function when data is shared amongst multiple parameters." into development
Former-commit-id: 41906e5278 [formerly d9650b113c] [formerly 41906e5278 [formerly d9650b113c] [formerly 4c5a92876f [formerly 217b8d82c7b558a8c78126c3ba37f915a8c9e693]]]
Former-commit-id: 4c5a92876f
Former-commit-id: 33b21a127c [formerly 64f6a70c37]
Former-commit-id: 02e2a634cf
2013-01-08 10:46:29 -06:00
Ron Anderson
deeb9ab71b Merge "Issue #1438 fix problems reading a non existent grid alias file." into development
Former-commit-id: dc156f69c4 [formerly 61700b2f37] [formerly dc156f69c4 [formerly 61700b2f37] [formerly 19fc9e2bbc [formerly 3880bfbd8bf84a9ed4ba93b785b2a45f3af35f81]]]
Former-commit-id: 19fc9e2bbc
Former-commit-id: 0a585a9498 [formerly 5e9f24b527]
Former-commit-id: 693548c7d2
2013-01-08 10:36:19 -06:00
Ben Steffensmeier
a8077ca1c3 Issue #1438 fix problems reading a non existent grid alias file.
Former-commit-id: 15c7614ffe [formerly 4ca0f320cc] [formerly 15c7614ffe [formerly 4ca0f320cc] [formerly ecbbc823f1 [formerly 77868132755b799810c9a01888fcec06798070fb]]]
Former-commit-id: ecbbc823f1
Former-commit-id: b9980a0f77 [formerly 777a1d93bb]
Former-commit-id: 1a1c6d7efa
2013-01-08 10:32:50 -06:00
Nate Jensen
b56796d0ac Merge "Issue #1329 fixed bug in FileLocker" into development
Former-commit-id: 42b24aa97f [formerly 27a96cf383] [formerly 42b24aa97f [formerly 27a96cf383] [formerly f77cf10fea [formerly 079e2ac290f6d914b103be4ebec0420c2f9f0a93]]]
Former-commit-id: f77cf10fea
Former-commit-id: efb750cc67 [formerly f160900fe5]
Former-commit-id: 4a020340ee
2013-01-08 10:30:21 -06:00
Bryan Kowal
2ec11e041a Issue #1460 - Merge 4.7-GIS_Viewer into AWIPS2_baseline
Former-commit-id: 87d0821429 [formerly 76fe910606] [formerly 87d0821429 [formerly 76fe910606] [formerly 03f108f80b [formerly 9e0eae1725af06ce834c926a4d70195a075e8152]]]
Former-commit-id: 03f108f80b
Former-commit-id: 7dd7d1cfa7 [formerly bbeb6b5101]
Former-commit-id: 74f4811f07
2013-01-07 18:14:07 -06:00
Richard Peter
4a3000f19a Merge "Issue #1456 Changed ArrayList parameter to List." into development
Former-commit-id: 2eae9d7131 [formerly 42252b2c5a] [formerly 2eae9d7131 [formerly 42252b2c5a] [formerly 39d6e335ff [formerly f813d20563b711e270f751d2659d414487af06fb]]]
Former-commit-id: 39d6e335ff
Former-commit-id: 5f02ab4bb6 [formerly c2044ef63e]
Former-commit-id: 09eae47452
2013-01-07 17:04:47 -06:00
Richard Peter
884d082f9e Issue #1454: Update registry log4j
Change-Id: If564a1a3d00c6b719603544e1a319928f3fedaa5

Former-commit-id: 08922e14b7 [formerly c8f79ee0cc] [formerly 08922e14b7 [formerly c8f79ee0cc] [formerly 7b4d04e828 [formerly 81dd356264723578ab871c63bc47386cfb3d40ce]]]
Former-commit-id: 7b4d04e828
Former-commit-id: 84c5aa1d29 [formerly b9ae764a04]
Former-commit-id: bf14d0167a
2013-01-07 17:03:15 -06:00
Brad Gonzales
64f14fab4f Issue #1456 Changed ArrayList parameter to List.
Change-Id: I47e7a054b774f5f2707f53b1c3692c3ec07ac157

Former-commit-id: 69fcfd55bb [formerly 1c6cfee5cc] [formerly 69fcfd55bb [formerly 1c6cfee5cc] [formerly 71230cc246 [formerly 6ba091caf7aa4de243fbea57ed19ae99ddb39585]]]
Former-commit-id: 71230cc246
Former-commit-id: d0fae4de6d [formerly 9bcf7cbd07]
Former-commit-id: 844ee8cd77
2013-01-07 16:55:04 -06:00
Ben Steffensmeier
6ee146e0ed Issue #1459 fix interp function when data is shared amongst multiple parameters.
Former-commit-id: 167fe74ee7 [formerly f04c6b7e1e] [formerly 167fe74ee7 [formerly f04c6b7e1e] [formerly c0e9f3429b [formerly 9c8281cd26029e9b3979fbc8f0ed713b66f092ba]]]
Former-commit-id: c0e9f3429b
Former-commit-id: 76802aefa9 [formerly 93e6818a2d]
Former-commit-id: 4a051b3a57
2013-01-07 16:39:45 -06:00
Brad Gonzales
9fcb9f9179 Issue #1456 Added DualList.setSelectedList(ArrayList<String>).
Change-Id: I86765b965f90bf714ede8707c516287a91c64de7

Former-commit-id: 945d6be2c8 [formerly cf3a7e1455] [formerly 945d6be2c8 [formerly cf3a7e1455] [formerly e457297ceb [formerly 334782a0f7df272200196a3905d656d2fa3603d7]]]
Former-commit-id: e457297ceb
Former-commit-id: 66a5a6d5bc [formerly 7b0dc0478d]
Former-commit-id: a0a9a3027e
2013-01-07 16:08:18 -06:00
Max Schenkelberg
85e82e4b78 Issue #1329 fixed bug in FileLocker
Change-Id: Ide1f4cb2d9f5d6f6ebfb2eed8bac583f0b0e153e

Former-commit-id: ebb303ee06 [formerly d779a82c5e] [formerly ebb303ee06 [formerly d779a82c5e] [formerly 91a8e56302 [formerly 695f92db8aa698393bebfb4c2fed0bcf4d9d4efa]]]
Former-commit-id: 91a8e56302
Former-commit-id: 06004a0e08 [formerly 66f472ed37]
Former-commit-id: 8745f7acf1
2013-01-07 16:04:14 -06:00
Richard Peter
7ef0bc956c Merge "Issue #1431 - Fix Dual List filter problem." into development
Former-commit-id: bed085536e [formerly e329929bd2] [formerly bed085536e [formerly e329929bd2] [formerly 9ab999ed33 [formerly d0bcfbc3ce548ef84dff78ba50de8b44627bf8a8]]]
Former-commit-id: 9ab999ed33
Former-commit-id: 1cb120525b [formerly 13fac27c76]
Former-commit-id: 1f5f1c5950
2013-01-07 13:15:32 -06:00
Bryan Kowal
1996f92f7e Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
Former-commit-id: ab8b346489 [formerly c8a43edd9e] [formerly ab8b346489 [formerly c8a43edd9e] [formerly d6b4cb65f4 [formerly b535a90fb25287945485c10b3c85749c11285171]]]
Former-commit-id: d6b4cb65f4
Former-commit-id: 6d7f57c62a [formerly 146c43a606]
Former-commit-id: 0136f9d5a3
2013-01-07 12:16:01 -06:00
Mike Duff
08d438cdbc Issue #1431 - Fix Dual List filter problem.
Former-commit-id: 71ce5aa249 [formerly ace6214c3f] [formerly 71ce5aa249 [formerly ace6214c3f] [formerly 7eb980fd83 [formerly 0fc212dac04a4693060ee0e321c532a3f5076e01]]]
Former-commit-id: 7eb980fd83
Former-commit-id: 0014c1073a [formerly 4757feb616]
Former-commit-id: d72d3db542
2013-01-07 09:19:01 -06:00
Steve Harris
b7f180d9d3 13.1.2-6 baseline
Former-commit-id: efd3392abe [formerly 8e5f9e0e6c] [formerly efd3392abe [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: 82a1ed77a4 [formerly dbcae57f57]
Former-commit-id: 05bdc0ecd2
2013-01-06 14:55:11 -06:00
Steve Harris
f52ec0b0a0 13.1.2-2 baseline
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: cd4185ef5c [formerly 941337c553]
Former-commit-id: b6fa9b4858
2013-01-06 14:32:24 -06:00
Bryan Kowal
9d9f8bc837 Merge "Issue #1373 - prevent file naming conflicts" into development
Former-commit-id: 274aecc49b [formerly e6b9d5efa0] [formerly 274aecc49b [formerly e6b9d5efa0] [formerly 3128e0ae68 [formerly abc2790a82b6b6a80e7e958cd8c96dceaf78b860]]]
Former-commit-id: 3128e0ae68
Former-commit-id: 5efecb2e6b [formerly fc9ce23c7c]
Former-commit-id: 838c77bca1
2013-01-05 10:41:54 -06:00
Bryan Kowal
7138f2a20f Issue #1373 - prevent file naming conflicts
Change-Id: Ibf3996983a0df3eee39fd5bc7d65bf43044c0e02

Former-commit-id: 94fe1c8f59 [formerly 9079c2dd3f] [formerly 94fe1c8f59 [formerly 9079c2dd3f] [formerly 2c9e5d68fa [formerly b7c11d1a5d55908a9e60e29b68fa01bf924c1429]]]
Former-commit-id: 2c9e5d68fa
Former-commit-id: 5aed64be97 [formerly 6580901b03]
Former-commit-id: ad30a7fb6a
2013-01-05 10:40:10 -06:00
Richard Peter
358b09b0d2 Merge "Issue #1451 Allow overriding of IUserManager via ServiceLoader." into development
Former-commit-id: 0923729898 [formerly 4fe4daf973] [formerly 0923729898 [formerly 4fe4daf973] [formerly 36c31ce6df [formerly a1f84dbd0a1ef95c0303119f152396aaed6fcb16]]]
Former-commit-id: 36c31ce6df
Former-commit-id: 2029ea53b8 [formerly 6457ab4bdb]
Former-commit-id: a60d057a2a
2013-01-04 13:31:48 -06:00
Bryan Kowal
a14d25ded0 Issue #1373 - the edexServiceList script will now be packaged in the edex-base and the datadelivery rpms
Former-commit-id: 2d9e54ddf8 [formerly 9062ed93d7] [formerly 2d9e54ddf8 [formerly 9062ed93d7] [formerly e131b5bc72 [formerly 96fe189b5af5fbf0424504cc0b27d44c1defc0c2]]]
Former-commit-id: e131b5bc72
Former-commit-id: ce21e23e52 [formerly 8a4bc85bad]
Former-commit-id: d2cd60bb5c
2013-01-04 12:50:37 -06:00
Dustin Johnson
3d9c459c10 Issue #1451 Allow overriding of IUserManager via ServiceLoader.
Change-Id: Iec63c05fe7365051e7bd1a01ecca701b5553c9e9

Former-commit-id: f5f6884b79 [formerly 452729a647] [formerly f5f6884b79 [formerly 452729a647] [formerly 19f1b30437 [formerly 46d756ba5cd37ae22fc31ae67dac0751c2c02985]]]
Former-commit-id: 19f1b30437
Former-commit-id: cdf08ea65a [formerly 818664e557]
Former-commit-id: a29d38f5f9
2013-01-04 12:34:43 -06:00