Bryan Kowal
|
2c31c6f4ab
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.csh
rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.sh
rpms/awips2.core/Installer.tools/component.spec
rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.csh
rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.sh
Former-commit-id: d73aaf9753 [formerly 4bad21e6cd] [formerly d73aaf9753 [formerly 4bad21e6cd] [formerly 3255bf3861 [formerly 4ad10d4cc3b189c65352f0c205fe8664a52bf407]]]
Former-commit-id: 3255bf3861
Former-commit-id: 400b4a1328 [formerly 76726372e5]
Former-commit-id: 748ab480fb
|
2013-11-05 19:03:22 -06:00 |
|
Ben Steffensmeier
|
5cf9a6ed01
|
Issue #2485 Remove ncccfp
Change-Id: Ida05b2c7e1a3541603822b8b91bb635f9af3fa64
Former-commit-id: 4639cd69f4 [formerly 5b53cb4c98] [formerly 4639cd69f4 [formerly 5b53cb4c98] [formerly 1d35086e8d [formerly 619f054e44fe9689d178e9aa6fd6455915d7e99e]]]
Former-commit-id: 1d35086e8d
Former-commit-id: b64221f27b [formerly 8aefe5ff02]
Former-commit-id: a97ec9b8e5
|
2013-11-05 17:33:41 -06:00 |
|
Nate Jensen
|
c84829347f
|
Merge "Issue #2521 DatasetMetaData URL update failure for point data. Change-Id: I3421bb6acdc3f44ef7341279c0b253acea2e59ea" into development
Former-commit-id: e9c2738ffd [formerly 29293977f5] [formerly e9c2738ffd [formerly 29293977f5] [formerly 0b5dfb8ecd [formerly 56158b31325ccf0a06fe031790988eb8f39af7d9]]]
Former-commit-id: 0b5dfb8ecd
Former-commit-id: 6e228eca0f [formerly 5515ce94c7]
Former-commit-id: 154c132ae4
|
2013-11-05 15:57:00 -06:00 |
|
Nate Jensen
|
cb282cc273
|
Merge "Issue #2250 refactor JUtil to be less dependent on certain elements, make DAF easier to use" into development
Former-commit-id: 0251b0fc44 [formerly 02dad36407] [formerly 0251b0fc44 [formerly 02dad36407] [formerly 8c4d84c429 [formerly 2192c52604b66e1a675c005c4bb9d972a166f5fb]]]
Former-commit-id: 8c4d84c429
Former-commit-id: 90bc290c33 [formerly 59126bf527]
Former-commit-id: 68d0c9e726
|
2013-11-05 15:56:13 -06:00 |
|
Nate Jensen
|
10e392a7e3
|
Merge "Issue #2520 - Update rpm query calls" into development
Former-commit-id: f5440862f3 [formerly 183f46df4b] [formerly f5440862f3 [formerly 183f46df4b] [formerly 76d21878e4 [formerly d1234253ea620effba3f7bdb32f3e478562da92d]]]
Former-commit-id: 76d21878e4
Former-commit-id: 131e6c803f [formerly e604ea08f6]
Former-commit-id: 701fd08dd1
|
2013-11-05 15:55:57 -06:00 |
|
Richard Peter
|
ab072bf5f0
|
Merge "Issue #1679 Minor changes to support custom registry query plugins" into development
Former-commit-id: f3e6ed22b2 [formerly 962b21efa1] [formerly f3e6ed22b2 [formerly 962b21efa1] [formerly 82ad286653 [formerly 1c367816d3acbdbef01b4889a85e35abaf6623e4]]]
Former-commit-id: 82ad286653
Former-commit-id: 6f24910797 [formerly 48ccfe2cd8]
Former-commit-id: 69dccad4be
|
2013-11-05 15:50:34 -06:00 |
|
Richard Peter
|
0c7859f720
|
Merge "Issue #2494 Changed logging structure in DD" into development
Former-commit-id: 14cd82a6b8 [formerly df4e003cf3] [formerly 14cd82a6b8 [formerly df4e003cf3] [formerly 462ed0141a [formerly fbf54761279f40b3553b1d5d1c77f6129de18cb4]]]
Former-commit-id: 462ed0141a
Former-commit-id: 888f3383e3 [formerly d787096ee8]
Former-commit-id: 0888991d6c
|
2013-11-05 15:50:17 -06:00 |
|
Dave Hladky
|
d41abda3c8
|
Issue #2521 DatasetMetaData URL update failure for point data.
Change-Id: I3421bb6acdc3f44ef7341279c0b253acea2e59ea
Former-commit-id: bade1cd3bd [formerly 0a331e84ed] [formerly bade1cd3bd [formerly 0a331e84ed] [formerly ef1efac63c [formerly 4821b94172554f98496a59f0d688a3edb5a43a63]]]
Former-commit-id: ef1efac63c
Former-commit-id: 8f459c229f [formerly 100786338a]
Former-commit-id: dc4e4ac4d0
|
2013-11-05 15:19:42 -06:00 |
|
Greg Armendariz
|
bb2f387371
|
Issue #2520 - Update rpm query calls
Change-Id: I2fc1ac0fa8b9e199149fd2db3ab25bac9ba90024
Former-commit-id: 67ae7d2244 [formerly 62324b5194] [formerly 67ae7d2244 [formerly 62324b5194] [formerly b078f57dc7 [formerly 95c604d179e14d110e0782a5a911f8b6d5104941]]]
Former-commit-id: b078f57dc7
Former-commit-id: 9959fe56ae [formerly f125f963b3]
Former-commit-id: 2c581c0c73
|
2013-11-05 13:30:01 -06:00 |
|
Matt Nash
|
054cf29e4b
|
Issue #2250 refactor JUtil to be less dependent on certain elements, make DAF easier to use
Change-Id: Ic89f4669529ac13f3c69ede8553cf57bbfd73760
Former-commit-id: dc160577cc [formerly b3573e90c9] [formerly dc160577cc [formerly b3573e90c9] [formerly c2d6c2af41 [formerly 48c392d8000d8cc3a5c8371319fddd776566ef32]]]
Former-commit-id: c2d6c2af41
Former-commit-id: 8d3cf15469 [formerly a3ec6e58f5]
Former-commit-id: ca4f824b37
|
2013-11-05 12:27:12 -06:00 |
|
Benjamin Phillippe
|
7db190aca8
|
Issue #1679 Minor changes to support custom registry query plugins
Change-Id: I8ae98c80c243b710179e605a0ad1db302e86921b
Former-commit-id: 0fa6977442 [formerly 08706e9a94] [formerly 0fa6977442 [formerly 08706e9a94] [formerly 6a3fc6c059 [formerly 85e2b4a7717e24983b417a930402a8095d0c6021]]]
Former-commit-id: 6a3fc6c059
Former-commit-id: cafe62bf4c [formerly 7f37efd83a]
Former-commit-id: a87445ba09
|
2013-11-05 10:50:47 -06:00 |
|
Richard Peter
|
07500c21d8
|
Merge "Issue #1538 Moved data delivery specific web services out of registry plugins -- Added registry federation admin page -- Made registry service clients non-static" into development
Former-commit-id: 311c749cb2 [formerly bed067dc4e] [formerly 311c749cb2 [formerly bed067dc4e] [formerly 3d293fce88 [formerly 44665bcb3b4745532ce0febf26a6b5a000e1a0bc]]]
Former-commit-id: 3d293fce88
Former-commit-id: b442f6c3fa [formerly c70e6f127b]
Former-commit-id: 25ffcdf751
|
2013-11-05 10:09:42 -06:00 |
|
Steve Harris
|
280de5fb9e
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 1a9ff8df10 [formerly 2e0db025f3] [formerly 1a9ff8df10 [formerly 2e0db025f3] [formerly a956fd7f4d [formerly 1e8e1f73bdbb02ee2f8c91d4a2128ea0d77cf084]]]
Former-commit-id: a956fd7f4d
Former-commit-id: 02907147b6 [formerly 6d20cd89ff]
Former-commit-id: 999fd5433c
|
2013-11-04 20:29:07 -06:00 |
|
Nate Jensen
|
60d1b1e3e5
|
Merge "Issue #2472 Replacing lost commit" into development
Former-commit-id: ab969fde67 [formerly 68e60576dc] [formerly ab969fde67 [formerly 68e60576dc] [formerly f595fc9bb3 [formerly 82513b3d8d53a089f9884e0922de5e8ebdc26a37]]]
Former-commit-id: f595fc9bb3
Former-commit-id: 7fb0844a84 [formerly 6f29a5f7a0]
Former-commit-id: 4be0b1a196
|
2013-11-04 16:53:17 -06:00 |
|
Dave Hladky
|
061594260a
|
Issue #2494 Changed logging structure in DD
Former-commit-id: 042f5213f3 [formerly cbe4572b65] [formerly 042f5213f3 [formerly cbe4572b65] [formerly 180cf8b770 [formerly ddefe46379c9603bc4c8b603793c5053bce2b476]]]
Former-commit-id: 180cf8b770
Former-commit-id: 5ae6480a78 [formerly 32abcfccd2]
Former-commit-id: f94d3eafd3
|
2013-11-04 16:35:49 -06:00 |
|
Dave Hladky
|
5eefed071f
|
Issue #2472 Replacing lost commit
Former-commit-id: 62d08dbe93 [formerly 1f1469fe82] [formerly 62d08dbe93 [formerly 1f1469fe82] [formerly 9c6a430d40 [formerly 7c1f7ad737361b55e85bdf48dad24c7a60b36e99]]]
Former-commit-id: 9c6a430d40
Former-commit-id: 2a2b35d62c [formerly 47b946fc3b]
Former-commit-id: d5a1042ba3
|
2013-11-04 16:24:14 -06:00 |
|
Ron Anderson
|
d01be57d35
|
Merge "Issue #2508 Added DiscreteGridSlice.setKeys() to fix error in serialization." into development
Former-commit-id: 196e2fc2d1 [formerly 8e1c3a80a7] [formerly 196e2fc2d1 [formerly 8e1c3a80a7] [formerly 8ecd11fe71 [formerly 1caad52e03dfddb4e3c64fff79d5b6aca9c73a6f]]]
Former-commit-id: 8ecd11fe71
Former-commit-id: 20e455c431 [formerly 844146fcd7]
Former-commit-id: a04c8c3536
|
2013-11-04 15:55:36 -06:00 |
|
Ron Anderson
|
846d4001b4
|
Issue #2508 Added DiscreteGridSlice.setKeys() to fix error in serialization.
Change-Id: I0edcf4e113f7226650a8363a3d7f0225f482c8f8
Former-commit-id: a5820f8ddf [formerly b6eb0df14c] [formerly a5820f8ddf [formerly b6eb0df14c] [formerly 9a737b2d4a [formerly fe6f8beb1174e605a1935899eb2e5ad6d1babd57]]]
Former-commit-id: 9a737b2d4a
Former-commit-id: 99a63bc182 [formerly 833e84b5b8]
Former-commit-id: 559f1e56f7
|
2013-11-04 15:22:32 -06:00 |
|
Nate Jensen
|
f15331607d
|
Issue #2361 remove ISerializableObject from redbook and hydro
Change-Id: Ib48dea5d734f19a9919da9fea752b5e0f38a2141
Former-commit-id: 27f09b8096 [formerly 6064000389] [formerly 27f09b8096 [formerly 6064000389] [formerly b36d28c9fd [formerly 2626a79c976ac016352a091bdf66890e929edc85]]]
Former-commit-id: b36d28c9fd
Former-commit-id: 5d2ec98600 [formerly 3e3400dc7c]
Former-commit-id: 27b1f123f0
|
2013-11-04 14:30:00 -06:00 |
|
Nate Jensen
|
7f50ec893e
|
Issue #2361 remove XML annotations from bufrmos
Former-commit-id: b1409d4002 [formerly 9b9d57bc94] [formerly b1409d4002 [formerly 9b9d57bc94] [formerly 1a25186415 [formerly f6a873e20e4cb7ce6fb47654ce3292b4f3bab99e]]]
Former-commit-id: 1a25186415
Former-commit-id: 173bff3eb8 [formerly b2847dd446]
Former-commit-id: e1ecfb468a
|
2013-11-04 13:34:01 -06:00 |
|
Ben Steffensmeier
|
dacf863d66
|
Issue #2491 Clean a few more procedure only objects from ISerializableObject files.
Former-commit-id: d386c6bc76 [formerly ff5f08d23a] [formerly d386c6bc76 [formerly ff5f08d23a] [formerly 5a928e6ad5 [formerly 047e4cd82846adaf8fc3dcdfe087209bd57e210c]]]
Former-commit-id: 5a928e6ad5
Former-commit-id: d38879158d [formerly 08e73de883]
Former-commit-id: a0f4c08cfd
|
2013-11-04 13:01:49 -06:00 |
|
Nate Jensen
|
3e4f5cdc53
|
Merge "Issue #2361 remove XML annotations from TAF and CCFP" into development
Former-commit-id: 8688681a8a [formerly a72197e828] [formerly 8688681a8a [formerly a72197e828] [formerly 3ef349882c [formerly 0a74b17463864bb9fb50b4e9450592b04a4dd481]]]
Former-commit-id: 3ef349882c
Former-commit-id: 823de65f07 [formerly 6bab0640a7]
Former-commit-id: bdadadec83
|
2013-11-04 11:48:04 -06:00 |
|
Lee Venable
|
ade7b14670
|
Merge "Issue #2486. Fixed an error of editing subset box. Corrected mouse wheel handler." into development
Former-commit-id: bfc83fa74e [formerly 0b3346d699] [formerly bfc83fa74e [formerly 0b3346d699] [formerly 3e7b7cec8f [formerly 325439c2d4243f775d3ccb8af7f332bf13d4aad0]]]
Former-commit-id: 3e7b7cec8f
Former-commit-id: c7d03bf267 [formerly f6f1b16c0c]
Former-commit-id: 52da34fc55
|
2013-11-02 10:43:48 -05:00 |
|
Slav Korolev
|
e4a2b6d619
|
Issue #2431. Changed labels on the table.
Former-commit-id: 8874f76878 [formerly dd1ff63737] [formerly 8874f76878 [formerly dd1ff63737] [formerly 0801f8dedd [formerly 5599d13b9cbac3806c636b629d502aacc1f621b4]]]
Former-commit-id: 0801f8dedd
Former-commit-id: 6b3481ca26 [formerly 7d0198b356]
Former-commit-id: f8e429a1b9
|
2013-11-01 15:06:19 -04:00 |
|
Nate Jensen
|
1d8522d45d
|
Issue #2361 remove XML annotations from TAF and CCFP
Former-commit-id: c52c207c80 [formerly 942936e815] [formerly c52c207c80 [formerly 942936e815] [formerly cd49daccf9 [formerly 2587a9b13ec6576007081a165f6042dd5a82b7eb]]]
Former-commit-id: cd49daccf9
Former-commit-id: a6cfeb5626 [formerly d935c4f547]
Former-commit-id: 6dafd588d0
|
2013-11-01 13:19:28 -05:00 |
|
Nate Jensen
|
a3cb4309d1
|
Merge "Issue #2361 move ebxml away from using SerializationUtil for XML processing" into development
Former-commit-id: 1ac6a4ea18 [formerly 7156ac5d4f] [formerly 1ac6a4ea18 [formerly 7156ac5d4f] [formerly 6fac918395 [formerly 84226cbd63d12c6c1624dfc1dd72b42360d0e54d]]]
Former-commit-id: 6fac918395
Former-commit-id: 8c3eb7612c [formerly b5d457f566]
Former-commit-id: 7691a13fec
|
2013-11-01 12:27:21 -05:00 |
|
Nate Jensen
|
2ee7f2e275
|
Issue #2361 move ebxml away from using SerializationUtil for XML processing
Change-Id: I04decec05b44a9c1881963f1a902adf6742aafa9
Former-commit-id: 2e28d72fb7 [formerly 2413c854c0] [formerly 2e28d72fb7 [formerly 2413c854c0] [formerly 5efd1b7218 [formerly ebf2c3c32945fefe8fd8c054b163fba238ac0ee5]]]
Former-commit-id: 5efd1b7218
Former-commit-id: 3753b45c0c [formerly f4cdcb2fae]
Former-commit-id: 96cd52250a
|
2013-11-01 12:09:43 -05:00 |
|
Ron Anderson
|
638b57e188
|
Merge "Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product." into development
Former-commit-id: a15c620fc8 [formerly 9e9dd04bfd] [formerly a15c620fc8 [formerly 9e9dd04bfd] [formerly cc991ed528 [formerly 6346ae61d0639325fa199db525f4e34402b39224]]]
Former-commit-id: cc991ed528
Former-commit-id: f453d92818 [formerly deb89a88f5]
Former-commit-id: 84adff8e96
|
2013-11-01 11:07:39 -05:00 |
|
Greg Armendariz
|
3061eb1bc0
|
Issue #2509 - Fix merge issue
Former-commit-id: a281147055 [formerly b4c3337ffd] [formerly a281147055 [formerly b4c3337ffd] [formerly fadf9346d2 [formerly d742b452ab114935b76cb9097db7d6a08651bb2e]]]
Former-commit-id: fadf9346d2
Former-commit-id: 1561f091e3 [formerly d530a65ee3]
Former-commit-id: c90f8115f3
|
2013-11-01 10:31:08 -05:00 |
|
Dave Hladky
|
b8b78939e3
|
Issue #2292 Stopped subscriptions from checking against themselves. This prevented subscriptions from being updatable.
Former-commit-id: 1594cc6a72 [formerly e5896397f6] [formerly 1594cc6a72 [formerly e5896397f6] [formerly 422dabf3eb [formerly 6edfeb94cfb14785d68d90b41fc636faa2ece074]]]
Former-commit-id: 422dabf3eb
Former-commit-id: d589bced40 [formerly ca1f2fc340]
Former-commit-id: 448d13c266
|
2013-11-01 10:23:56 -05:00 |
|
Slav Korolev
|
884ca2167c
|
Issue #2486. Fixed an error of editing subset box. Corrected mouse wheel handler.
Former-commit-id: feb9d8db5a [formerly 7ca47690af] [formerly feb9d8db5a [formerly 7ca47690af] [formerly f7d1939b36 [formerly 7d16b7dd07d83975366505140d7a8df2c5c89cf2]]]
Former-commit-id: f7d1939b36
Former-commit-id: fcbe5d09da [formerly 386db59985]
Former-commit-id: 57fc9a2183
|
2013-11-01 11:03:06 -04:00 |
|
Benjamin Phillippe
|
c3f684e7fb
|
Issue #1538 Moved data delivery specific web services out of registry plugins
-- Added registry federation admin page
-- Made registry service clients non-static
Change-Id: I9672f11b4886019dcd8834b4bae417a0aa4809ad
Former-commit-id: 98b56cf02a [formerly a7e53870fb] [formerly 98b56cf02a [formerly a7e53870fb] [formerly d8de923f8b [formerly 0a67c8d68548ed8daa76d782ca3213956b984795]]]
Former-commit-id: d8de923f8b
Former-commit-id: 7cb19682c1 [formerly 221d197c01]
Former-commit-id: 73c53ed846
|
2013-11-01 09:20:00 -05:00 |
|
Dave Hladky
|
e30272c56b
|
Issue #2448 Fixed retrievals before activePeriod begins and after activePeriod expires.
Change-Id: I75269bad24731990720d30683ebf5f27344661f3
Former-commit-id: 0eba787d3e [formerly 4227f3a59f] [formerly 0eba787d3e [formerly 4227f3a59f] [formerly 9161962813 [formerly 060e719f27c20f24bae9a5603cc51d90434b8fa4]]]
Former-commit-id: 9161962813
Former-commit-id: ba31efaf03 [formerly d55d68fe5a]
Former-commit-id: 85003bf022
|
2013-11-01 08:23:16 -05:00 |
|
Nate Jensen
|
3858434dc3
|
Merge "Issue #2491 Fix collaboration Xml." into development
Former-commit-id: b986638bc5 [formerly 43b2f50a0a] [formerly b986638bc5 [formerly 43b2f50a0a] [formerly 0270e6bde3 [formerly 311f84bcd1e10f9fd52df836673c9bb6012ee8a0]]]
Former-commit-id: 0270e6bde3
Former-commit-id: 6ed6df6ed0 [formerly 47fc100053]
Former-commit-id: 6164feb2da
|
2013-10-31 18:11:13 -05:00 |
|
Bryan Kowal
|
9bf7652dbd
|
Issue #2476 - re-compile jep for RHEL6 64-bit
Former-commit-id: fc05fd7140 [formerly 5b99b99d3c] [formerly fc05fd7140 [formerly 5b99b99d3c] [formerly d034d82744 [formerly 39a2c09fe71d3fbafa1a10dc08e7348f7710579c]]]
Former-commit-id: d034d82744
Former-commit-id: bde48968ca [formerly 7e94e4cd78]
Former-commit-id: 4006fd8f54
|
2013-10-31 15:56:34 -05:00 |
|
Bryan Kowal
|
0d8ab84604
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
cots/org.jep.linux64/libjep.so
Former-commit-id: 04bcd7e6dc [formerly 49422aea62] [formerly 04bcd7e6dc [formerly 49422aea62] [formerly d08a652e23 [formerly ecb1c0da101c986ef21bb8514660605926303a71]]]
Former-commit-id: d08a652e23
Former-commit-id: d53ec9c750 [formerly adb62df96a]
Former-commit-id: 70d4374ce8
|
2013-10-31 15:43:29 -05:00 |
|
Bryan Kowal
|
f5bb76a01e
|
Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
cave/build/static/common/cave/etc/bundles/StationPlot.xml
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
nativeLib/ncep_grib2module/.cproject
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
Former-commit-id: 38464427d3 [formerly feaacd9356] [formerly 38464427d3 [formerly feaacd9356] [formerly c8d7a32e2e [formerly bb2efa59ed211345e071829f47d41eba232baae9]]]
Former-commit-id: c8d7a32e2e
Former-commit-id: f02d4b7a0b [formerly d366e70934]
Former-commit-id: eaaa3d022c
|
2013-10-31 15:34:46 -05:00 |
|
Bryan Kowal
|
731efe0fb6
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
nativeLib/files.native/files.native.ecl
nativeLib/ncep_grib2module/.cproject
nativeLib/rary.cots.g2clib/.project
nativeLib/rary.cots.g2clib/g2_unpack3.c
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1
Former-commit-id: 4d7a4aefec [formerly 665911b033] [formerly 4d7a4aefec [formerly 665911b033] [formerly c76c856340 [formerly 412bcb0f21b7385a170d14b3a88dd67c91a301a2]]]
Former-commit-id: c76c856340
Former-commit-id: 7a83214b1c [formerly 0954490a5a]
Former-commit-id: 6e08dc72c0
|
2013-10-31 15:23:08 -05:00 |
|
Bryan Kowal
|
44d773b663
|
Issue #2476 - recompile jep for RHEL5 32-bit, RHEL5 64-bit, and Windows 32-bit
Former-commit-id: ecda7100be [formerly c74123f5a8] [formerly ecda7100be [formerly c74123f5a8] [formerly e9b76cf185 [formerly be179f2809180da7812a9f4b53b48870b13191ae]]]
Former-commit-id: e9b76cf185
Former-commit-id: 02cdbe0173 [formerly d08a1af457]
Former-commit-id: 71b5ef4733
|
2013-10-31 14:53:27 -05:00 |
|
David Gillingham
|
4862c1d171
|
Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product.
Change-Id: Id5aede1ba07019150b3a43b45f067a5740d657af
Former-commit-id: f404f1560c [formerly 6e1cca2966] [formerly f404f1560c [formerly 6e1cca2966] [formerly c4f5cc53bb [formerly 194799b7d3fb719987523a77ba9b3c69a11bb69f]]]
Former-commit-id: c4f5cc53bb
Former-commit-id: 3776f258a3 [formerly 3bac577a31]
Former-commit-id: 5df42898ad
|
2013-10-31 14:07:20 -05:00 |
|
Ben Steffensmeier
|
a92af46f59
|
Issue #2491 Fix collaboration Xml.
Former-commit-id: a5f970e238 [formerly 3d36cec7be] [formerly a5f970e238 [formerly 3d36cec7be] [formerly fdeff81da2 [formerly 64517ab3139be3cc21d5df7ff9d36709435bd7cd]]]
Former-commit-id: fdeff81da2
Former-commit-id: 89c999410e [formerly 49ffb7e92c]
Former-commit-id: a0e805ded6
|
2013-10-31 14:06:37 -05:00 |
|
Ron Anderson
|
49ea9c0444
|
Issue #2508 Added DiscreteGridSlice.getKeys(), deprecated getKey()
Change-Id: I5d47498c2056de1c217927102770092bb57a372c
Former-commit-id: b61ccc1609 [formerly 38e33092a2] [formerly b61ccc1609 [formerly 38e33092a2] [formerly 42e924e021 [formerly 19246ae601e292bd26ba8ba6b9446ef8d82ee663]]]
Former-commit-id: 42e924e021
Former-commit-id: 2f23072e41 [formerly eef9d2dfb0]
Former-commit-id: e3a0440825
|
2013-10-31 14:04:55 -05:00 |
|
Nate Jensen
|
3c1f343be5
|
Merge "Issue #2491 Bug fixes and clean up all remaining resource datas. Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6" into development
Former-commit-id: b17891ba0e [formerly ccf3d5b1e9] [formerly b17891ba0e [formerly ccf3d5b1e9] [formerly de50a9214b [formerly fc3adf193a8afacfec4c36feae4a3f1384119922]]]
Former-commit-id: de50a9214b
Former-commit-id: c9d9070600 [formerly d6fcc98e76]
Former-commit-id: c24d8c63cd
|
2013-10-31 12:24:23 -05:00 |
|
Richard Peter
|
ab890140fb
|
Merge "Issue #2292 - refactor and move overlap/duplicate checks to edex. Peer review comments" into development
Former-commit-id: 5048d010f5 [formerly 3139055873] [formerly 5048d010f5 [formerly 3139055873] [formerly b482eb2b48 [formerly 1f07e88f442c0426a9006a2f139d6eef9395ad51]]]
Former-commit-id: b482eb2b48
Former-commit-id: fca3d73aa7 [formerly 73462fa134]
Former-commit-id: 300f907c46
|
2013-10-31 11:46:25 -05:00 |
|
Mike Duff
|
5ff3fe2791
|
Issue #2292 - refactor and move overlap/duplicate checks to edex.
Peer review comments
Change-Id: I33df9cc7e368778943e25420d18b343781304c7a
Former-commit-id: c1bd170f8a [formerly f123fa11f5] [formerly c1bd170f8a [formerly f123fa11f5] [formerly 3fc811102e [formerly f7405c2acfef95b57b79cf6d8ac3348017e64a59]]]
Former-commit-id: 3fc811102e
Former-commit-id: b0c54d7c17 [formerly 4da0648461]
Former-commit-id: 26ca1b4d72
|
2013-10-31 09:22:50 -05:00 |
|
Greg Armendariz
|
c846280439
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 0daf07742e [formerly f6d98d6317] [formerly 0daf07742e [formerly f6d98d6317] [formerly 64dd62005b [formerly e1969dc2abafe372c0e9a874f464fc5336efd119]]]
Former-commit-id: 64dd62005b
Former-commit-id: 5cf091c499 [formerly 4fb0e0bd2f]
Former-commit-id: eefcbf7dcb
|
2013-10-30 14:52:16 -05:00 |
|
David Gillingham
|
75acd532a1
|
Issue #1843: Return status back to client when contacting one of the
configured ETN partners fails.
Change-Id: I5bd49f6930c317ba21725ff53f6ab65d548f037c
Former-commit-id: c58160c9a9 [formerly 297fd6c3d4] [formerly c58160c9a9 [formerly 297fd6c3d4] [formerly b7b29a1fdb [formerly 18a09da6aba3caf83f4c4df71f2fcffb63043fb1]]]
Former-commit-id: b7b29a1fdb
Former-commit-id: 68b0b2e3db [formerly 996817f124]
Former-commit-id: eef2c93d6c
|
2013-10-30 11:34:46 -05:00 |
|
Nate Jensen
|
fdb54d5810
|
Merge "Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code" into development
Former-commit-id: 411b909107 [formerly d92bd5b69a] [formerly 411b909107 [formerly d92bd5b69a] [formerly 62a5739feb [formerly 05de1d88cdc4841483864a623346ad16b015d395]]]
Former-commit-id: 62a5739feb
Former-commit-id: 90d99fe627 [formerly 5c4d8b4310]
Former-commit-id: 68658bf885
|
2013-10-30 11:28:58 -05:00 |
|
Bryan Kowal
|
dbe9ed1433
|
Issue #2297 - cleanup rpm directory structure; removing files that are no longer needed
Former-commit-id: e4e2c8c796 [formerly eb4c27003f] [formerly e4e2c8c796 [formerly eb4c27003f] [formerly b082ea89c5 [formerly d6c5bd5476a039058d5251f4457119fb10806b2e]]]
Former-commit-id: b082ea89c5
Former-commit-id: 63324cda6a [formerly 428dd993d9]
Former-commit-id: 4789797de5
|
2013-10-30 09:23:55 -05:00 |
|
Ben Steffensmeier
|
02b9133d50
|
Issue #2491 Bug fixes and clean up all remaining resource datas.
Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6
Former-commit-id: e15fecc459 [formerly 5b395f7417] [formerly e15fecc459 [formerly 5b395f7417] [formerly 27a392f90e [formerly 2412d6f094f98a8c24491ab43a2a88cf696758af]]]
Former-commit-id: 27a392f90e
Former-commit-id: 78efdb7572 [formerly 418c259567]
Former-commit-id: 9d87eb50e2
|
2013-10-29 17:35:55 -05:00 |
|