Benjamin Phillippe
396102ea5d
Issue #1931 Fixed Repository Items REST Service
...
Change-Id: I8876b708b7f6f08b08bc550099ae1bef47751f97
Former-commit-id: 5450a58ca6
[formerly 2c147fe159
] [formerly 1e413c68f6
] [formerly a226f225fd
[formerly 1e413c68f6
[formerly b2764126282aab128cc1465905c11686894ab1f7]]]
Former-commit-id: a226f225fd
Former-commit-id: 747180ba600bf97794019a0d0a919d238456940e [formerly 3b3ae2add0
]
Former-commit-id: 97a9a6279b
2013-06-03 10:26:36 -05:00
Dustin Johnson
fe1a709d42
Merge "Issue #2062 Fixed up AWIPS2_baseline portion of merge" into development
...
Former-commit-id: 5d4ecc6328
[formerly 72bb21698c
] [formerly 3700d27fbf
] [formerly 2e420c0963
[formerly 3700d27fbf
[formerly 18a9b41a8be832ab1e8da28c32f3b8457704915b]]]
Former-commit-id: 2e420c0963
Former-commit-id: 61046a1c3fa845ece0e8ae8c8320d66cfbcb9b43 [formerly da0335a5e5
]
Former-commit-id: 5b23635521
2013-05-31 15:29:04 -05:00
Dave Hladky
beeaaab97b
Issue #2062 Fixed up AWIPS2_baseline portion of merge
...
Change-Id: I3e327ee6789bf13357ff54c0843ce21a04bc870b
Former-commit-id: 87e81a8b1b
[formerly 39f357570b
] [formerly 2f67b74318
] [formerly fa8ea8ecca
[formerly 2f67b74318
[formerly 982daef280be6f3efe87a066fa5919be9cfeb9ec]]]
Former-commit-id: fa8ea8ecca
Former-commit-id: d931c9ba679b7ae50fda63241a3da00faf83a9e9 [formerly 9d2ec44182
]
Former-commit-id: 0317090ffd
2013-05-31 15:27:45 -05:00
Richard Peter
0ab13763ab
Merge "Issue #1869 speed up upgrade script for dropping dataURI." into development
...
Former-commit-id: e3d35f3d06
[formerly 47cdad3880
] [formerly c11f08b9ec
] [formerly 7f129cbe65
[formerly c11f08b9ec
[formerly 90b17526aa5b34d159315d9ea98e3022e015e025]]]
Former-commit-id: 7f129cbe65
Former-commit-id: e363a8d201347a607caddbb7d10a04ae39d7608e [formerly 07cf18028d
]
Former-commit-id: cce0de878a
2013-05-31 14:57:16 -05:00
Ben Steffensmeier
5a4c7791f5
Issue #1869 speed up upgrade script for dropping dataURI.
...
Former-commit-id: 3ae99d49a6
[formerly d7a8dc0baf
] [formerly 0d34bff004
] [formerly 78f56b32b0
[formerly 0d34bff004
[formerly 075e1cda11aeeef027a106c50d535fd7cb8adf2e]]]
Former-commit-id: 78f56b32b0
Former-commit-id: 9cb22087494e004d8402f46057af176301464acb [formerly 2da0c851f0
]
Former-commit-id: 640d8e9b6d
2013-05-31 14:43:38 -05:00
Dustin Johnson
8888f9e1fb
Issue #2038 Set attribute xml on mock opendap adapter
...
Change-Id: I2e2e68907b475848c7b5b556c9d33a7f07877083
Former-commit-id: f95e1f4618
[formerly 21b9724304
] [formerly 88c8ad3a81
] [formerly 76bdfc3a68
[formerly 88c8ad3a81
[formerly 5bdb3c359d80edfcc0029fb7264809c49f682579]]]
Former-commit-id: 76bdfc3a68
Former-commit-id: ad2cd861c2dcd656926d45517cf596108f6a17a9 [formerly 4d71652568
]
Former-commit-id: 4d7c894976
2013-05-31 13:54:41 -05:00
Greg Armendariz
da8783da2b
Merge "Issue #2047 - initial commit of Java 1.7; rpm build can build both Java 6 and Java 7" into development
...
Former-commit-id: d1eff126b0
[formerly e333debc2a
] [formerly d80ee4dede
] [formerly f040c69704
[formerly d80ee4dede
[formerly e20d4f7898f931deb45db5437625addbb37055c8]]]
Former-commit-id: f040c69704
Former-commit-id: fb813b88966ebc127a3186f83a308a0a4a446f06 [formerly 0a17b4873f
]
Former-commit-id: cf6938e321
2013-05-31 13:29:31 -05:00
Greg Armendariz
6b2a53f67d
Merge "Issue #2011 - re-adding native libraries that were previously removed." into development
...
Former-commit-id: 6fe0ff53c5
[formerly 088407c1c2
] [formerly 1eeafcaaf8
] [formerly 5e799ba8bc
[formerly 1eeafcaaf8
[formerly 47c28707fef620afd9b38d934c6310f7380c44e8]]]
Former-commit-id: 5e799ba8bc
Former-commit-id: 546876c1291af7b55af8c27f2fb5478f36eb652c [formerly ceba329f0d
]
Former-commit-id: 1304f0519d
2013-05-31 13:27:59 -05:00
Dustin Johnson
26517c1a95
Merge "Issue #2038 Change datadelivery retrieval to be plugin contributable" into development
...
Former-commit-id: 35e1c84a01
[formerly ba48f66886
] [formerly 2687ebafd6
] [formerly 87605571b2
[formerly 2687ebafd6
[formerly 606b358ba6bfebf410151217f1a7ad92839025b0]]]
Former-commit-id: 87605571b2
Former-commit-id: 1373c0b90f4a7aaa2a16437bb66461f4bae2c498 [formerly 1214f5e3ea
]
Former-commit-id: 0d77acbff2
2013-05-31 12:43:49 -05:00
Dustin Johnson
5931027de7
Merge "Issue #2038 Fix ability to get shared subscriptions by id" into development
...
Former-commit-id: 7e68af0531
[formerly 0bfcf4e9df
] [formerly 3d8de9e9f3
] [formerly 1d06883d7a
[formerly 3d8de9e9f3
[formerly 493d8a02f516023a5c0c3620da75e5466c44ede2]]]
Former-commit-id: 1d06883d7a
Former-commit-id: 52ab987a84e9614c5e4516479c934f07c0f6a2b0 [formerly 72d95aac0d
]
Former-commit-id: d61d518bdc
2013-05-31 12:32:23 -05:00
Dustin Johnson
d1552d578f
Issue #2038 Change datadelivery retrieval to be plugin contributable
...
Amend: Fix class name resolution, no arguments to metadata adapter constructors
Change-Id: I2c08563499a34996502d22f0f9685602b8897139
Former-commit-id: 174df7bdd6
[formerly 6234417095
] [formerly 4a8adeb80a
] [formerly 55aeff3422
[formerly 4a8adeb80a
[formerly fc6effe4993694944d5331038d24310dec44a5d8]]]
Former-commit-id: 55aeff3422
Former-commit-id: fc670c4505d46445bdd5ffc292571b65c25bcbdf [formerly 075c53763d
]
Former-commit-id: 7ec3c6c09a
2013-05-31 12:19:07 -05:00
Bryan Kowal
2f4e04a818
Issue #2047 - initial commit of Java 1.7; rpm build can build both Java 6 and Java 7
...
- Amend: update 32-bit rpm build script
Change-Id: I23fae3f39e7fedb00b46fffb3aa1540dd87ed6b6
Former-commit-id: a2752092eb
[formerly ba097c8a48
] [formerly a78c84dcd7
] [formerly 203d886739
[formerly a78c84dcd7
[formerly b68957a08d64f697b373bb017e28ee5fa186ed82]]]
Former-commit-id: 203d886739
Former-commit-id: 41783f7e227512d37dd7ab56c04b1bec2805ea4f [formerly f63c05e5cf
]
Former-commit-id: e6da4debed
2013-05-31 11:47:09 -05:00
Richard Peter
ef5e42fd6d
Merge "Issue #2054 Minor changes to 2 grib patterns in the pqact template." into development
...
Former-commit-id: dffd58a7ce
[formerly a9e1fa602e
] [formerly 8e06328905
] [formerly 6ec966e39e
[formerly 8e06328905
[formerly 9b0bed97ebab78c585efe2ffec3e25d896817e6e]]]
Former-commit-id: 6ec966e39e
Former-commit-id: fd1fb4b26da9a8acbc61d829b897fd491990760d [formerly dd5b0c4caf
]
Former-commit-id: 08fea26653
2013-05-31 10:36:27 -05:00
Dustin Johnson
8df55423f5
Issue #2038 Fix ability to get shared subscriptions by id
...
Change-Id: Iff7d9ab52e8152e7f950a536e49d92acad45dd19
Former-commit-id: f6c89fa3d9
[formerly b4bc2ca947
] [formerly fc807288a7
] [formerly 05bd3e113d
[formerly fc807288a7
[formerly e308ea7b1bc786832d4414369f86cc2d02f71ae2]]]
Former-commit-id: 05bd3e113d
Former-commit-id: e9924f52a848d24038a0a3fb3705c0ff67f9a02e [formerly 42d1d74b04
]
Former-commit-id: 3f4b010b84
2013-05-31 09:29:44 -05:00
Bryan Kowal
1c75b665b4
Issue #2011 - re-adding native libraries that were previously removed.
...
- Even though the awips2-python and the awips2-java already provide the libraries, these
libraries are shared by both EDEX and CAVE. But, hydro is 32-bit and CAVE is 64-bit;
so, hydro on the CAVE workstations is not able to use the 64-bit versions of the libraries
provided by the awips2-python and awips2-java installed on the CAVE workstation.
Former-commit-id: b8ef3ae959
[formerly 5ac8004618
] [formerly f52c3498b1
] [formerly 933c54a7d8
[formerly f52c3498b1
[formerly 1d8dfea6c421e98fa629d0bccb9cf9a71ca000a5]]]
Former-commit-id: 933c54a7d8
Former-commit-id: 1aff99903bc85362a86da76c37c1f20bde91c55e [formerly e61f417b47
]
Former-commit-id: 43a498f1a0
2013-05-30 22:45:09 -05:00
Richard Peter
dcee8de5bf
Merge "Issue #1966 Changes to make manger stateless and updates for Case Creation." into development
...
Former-commit-id: a25207c4f5
[formerly 6a19a0074f
] [formerly 6487cd6578
] [formerly 0e4782aea5
[formerly 6487cd6578
[formerly a8f4dced2e1a5ed2851291627d2349b818da239d]]]
Former-commit-id: 0e4782aea5
Former-commit-id: 94f8dd7cc2d9448c67b8b2be7d600c1f56ec5379 [formerly c81610b720
]
Former-commit-id: 9675eb9b1e
2013-05-30 17:17:23 -05:00
Dustin Johnson
5d995a726f
Merge "Issue #2049 Sister ticket to #753 , WFS retrieval impl for MADIS" into development
...
Former-commit-id: f3835a5670
[formerly 54045d6b9b
] [formerly c01ea33d5b
] [formerly e4ecae9e7e
[formerly c01ea33d5b
[formerly f91e04da588da1714fd791ade2ecbfa826c9cdca]]]
Former-commit-id: e4ecae9e7e
Former-commit-id: f7a467f666496a4ca4ff1bd58f5061cc1b7eb62c [formerly 58b11e075c
]
Former-commit-id: 353630fcca
2013-05-30 17:11:19 -05:00
Dave Hladky
e28331d3bb
Issue #2049 Sister ticket to #753 , WFS retrieval impl for MADIS
...
Change-Id: I5e3f2a1f4047ab61d6d19a1fde0ff539df3863b7
Former-commit-id: 7393abfc91
[formerly c292bf1b55
] [formerly 1608d407d1
] [formerly 83dae4fe01
[formerly 1608d407d1
[formerly 636bed36a4f7adc5db8b476d618ff4d67c806671]]]
Former-commit-id: 83dae4fe01
Former-commit-id: 724bfb742a41ede685551f3df79514daaee58c8b [formerly 90e6d184e7
]
Former-commit-id: 64596d3468
2013-05-30 17:04:16 -05:00
Roger Ferrel
9ef53f18b9
Issue #1966 Changes to make manger stateless and updates for Case Creation.
...
Change-Id: I62118209fad2a28d6dd3cac4abf7bb86cc782387
Former-commit-id: cfcd38da58
[formerly d6672697aa
] [formerly c6cddc605d
] [formerly 3c875a6f44
[formerly c6cddc605d
[formerly 3f43fdc896ff616915a8aa5ef986d3a82e52aa51]]]
Former-commit-id: 3c875a6f44
Former-commit-id: bf07997d68cd2a97eb874705475caf9100eded09 [formerly eaca117b9c
]
Former-commit-id: 36b8cbcd5d
2013-05-30 16:35:11 -05:00
Nate Jensen
09215e6dbb
Merge "Issue #2052 Fix FeatureExplorer feature comparison" into development
...
Former-commit-id: 03833d148d
[formerly 10dd7ea61f
] [formerly 4aa3657d1a
] [formerly e4578ca7ba
[formerly 4aa3657d1a
[formerly 3d6d6acb67bdd0a3d1e41a66873441686ed2c895]]]
Former-commit-id: e4578ca7ba
Former-commit-id: 86618d2ea904ba85327447d5180c4eef0264924d [formerly c0bca7ec27
]
Former-commit-id: 698d793e9c
2013-05-30 14:50:39 -05:00
Roger Ferrel
7353c052ed
Issue #2054 Minor changes to 2 grib patterns in the pqact template.
...
Change-Id: Ide79c8cadccd76b95aab400fca545c6fa09addcf
Former-commit-id: 3bd85138cf
[formerly 3c4b351c75
] [formerly 85b9d9dea9
] [formerly 2f2c553089
[formerly 85b9d9dea9
[formerly 5d70b9a7258b9f1c6b20e4f7d9354af5bd379ab4]]]
Former-commit-id: 2f2c553089
Former-commit-id: d3eddf23547cafc9eba0b328fea23856199aef10 [formerly 593055e6c2
]
Former-commit-id: 13543ac79e
2013-05-30 14:34:54 -05:00
Steve Harris
e83fa33a36
Issue #1871 - Merge branch 'vlab' into development
...
Conflicts:
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
Former-commit-id: 4e0ce194d9
[formerly 3e66acde96
] [formerly 3745089239
] [formerly 26bf27c70d
[formerly 3745089239
[formerly 836c0d6a7873dd77dd58226fe389736652fb51a9]]]
Former-commit-id: 26bf27c70d
Former-commit-id: 1a20439be64f0eb903e06ca2e50db5a76b284942 [formerly 1691fa413c
]
Former-commit-id: 629e76e0ff
2013-05-30 14:33:24 -05:00
Ron Anderson
d3a25be20d
Merge "Issue #1869 ensure all uses ofdataURI in PDO use getter. Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f" into development
...
Former-commit-id: 7d2d162be4
[formerly 79a8cd1b6f
] [formerly dd10af4a8a
] [formerly 7f41d701be
[formerly dd10af4a8a
[formerly 6677e2f2af09b114066c64b465e7245d0566ee8a]]]
Former-commit-id: 7f41d701be
Former-commit-id: 29d381fcafb440df8bee454e31c8b3d99cccd467 [formerly d2f617a49c
]
Former-commit-id: 5858e8fc19
2013-05-30 13:08:26 -05:00
Everett Kladstrup
f78c5c3640
Issue #2052 Fix FeatureExplorer feature comparison
...
* fixes complaint when feature A includes features B and C
which both include feature D.
Used to get error that plugin X is in feature D and feature D
* Updated FeatureExplorer jar in build.edex to reflect change
Change-Id: Ifbd5957a33f9815143794d8d4a29a6e66ce275c7
Former-commit-id: 7d7e276e2a
[formerly 9541c93640
] [formerly 0b2839fd43
] [formerly 4621271329
[formerly 0b2839fd43
[formerly 792255325dd584238c47f53d5cf1d642465b53d6]]]
Former-commit-id: 4621271329
Former-commit-id: 0783e1b2908b365b45911f9fff3604f64d2ddbc5 [formerly 9ad045d141
]
Former-commit-id: 282ec3b45f
2013-05-30 13:02:49 -05:00
Dustin Johnson
bf277cb980
Merge "Issue #2038 Remove unused schemas from datadelivery spring files" into development
...
Former-commit-id: b7d7d66727
[formerly 80309d6a4e
] [formerly 7e6bdb7b70
] [formerly 9c9caf00d1
[formerly 7e6bdb7b70
[formerly b1c288e1e4d9a4df409ac8c1156c0c91f3eb67a8]]]
Former-commit-id: 9c9caf00d1
Former-commit-id: 14f966873ac8e545bcc3b5a381d244edc0c40df1 [formerly 0bdf7d614c
]
Former-commit-id: 48c37c972a
2013-05-30 11:32:09 -05:00
Dustin Johnson
ac8c2784ae
Issue #2038 Remove unused schemas from datadelivery spring files
...
Change-Id: I65a53510e3e8f9aba3fc64f011dad0905cde8b26
Former-commit-id: 0ac058008d
[formerly 463bed7647
] [formerly efc3c6a2f2
] [formerly b99a8bc4f9
[formerly efc3c6a2f2
[formerly 2c5b357da096c9c1e2cd76560d143b8009aaba0f]]]
Former-commit-id: b99a8bc4f9
Former-commit-id: 29d324567d73f72efae9e9fed9f02433168147e4 [formerly b1d66a0450
]
Former-commit-id: 74d985af51
2013-05-30 09:49:09 -05:00
Brad Gonzales
c8811ff347
Issue #1965 Commit for purge and archive with tests.
...
A lot of this ended up being duplication of Roger's code. Roger's changes should go first,
and then this commit will be merged and refactored with his code in an amend.
Amend: better test coverage, fixes to old other pattern
integrated with Roger's changes.
added header comments, deleted FileArchiveElement.
removed search and filter code.
Change-Id: I4e48842a75b9da27062349fee01099e1ea13f59e
Former-commit-id: 778cf6542c
[formerly 6243f1f789
] [formerly aa76f81b3c
] [formerly 321f153547
[formerly aa76f81b3c
[formerly 991622c763767a1e291be8c9f3c10da2b5fd7e32]]]
Former-commit-id: 321f153547
Former-commit-id: 34d580ade00224baada454c96f672dc4ee914ab2 [formerly bbc15413d4
]
Former-commit-id: cb69ca7e93
2013-05-30 09:34:18 -05:00
Bryan Kowal
cad451315d
Issue #2048 - foss jars that have associated source code will no longer be removed from the distribution
...
Change-Id: I444a4c9fd2d2e7fbe1ab1af7c1a4d22bcdaafc14
Former-commit-id: 3c98d835bf
[formerly 52a1addb29
] [formerly 7b24cd293a
] [formerly bd9251eba0
[formerly 7b24cd293a
[formerly 19a96c99d10b540058e4d9c0d1729852dd18f1e9]]]
Former-commit-id: bd9251eba0
Former-commit-id: 12f6e2d4de44a38803b3d5a550206ae1507ca67f [formerly 4eb7d951e4
]
Former-commit-id: 5ee9c9f6a1
2013-05-29 21:52:10 -05:00
Ben Steffensmeier
c6150879d5
Issue #1869 ensure all uses ofdataURI in PDO use getter.
...
Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f
Former-commit-id: 05e7e0551f
[formerly b3865f4efc
] [formerly 268ee5ce30
] [formerly 191f93653d
[formerly 268ee5ce30
[formerly bcb8cea56a2efb9bf953c7acb474bb8046ef7570]]]
Former-commit-id: 191f93653d
Former-commit-id: e05811b6ef35d30d860c10a4de489276bfcbbd43 [formerly 50c5c5edfa
]
Former-commit-id: 9c415e2f19
2013-05-29 17:50:50 -05:00
Richard Peter
29a1c468f3
Merge "Issue #1989 remove unused schemas" into development
...
Former-commit-id: a88b17b125
[formerly 47b95286ad
] [formerly d563ae4eb8
] [formerly 800c7dd9a6
[formerly d563ae4eb8
[formerly d024f084f303bf6020ef7208cad249ac83f4d748]]]
Former-commit-id: 800c7dd9a6
Former-commit-id: 39176b198c944580b580ade837ef1dd8fbe25836 [formerly c8c5be650c
]
Former-commit-id: 4788532b86
2013-05-29 16:54:51 -05:00
Nate Jensen
70eca967a3
Merge "Issue #1869 fix plot updates, broken by earlier commit." into development
...
Former-commit-id: 07009bf650
[formerly df5945a8e2
] [formerly 4f3ea80cd9
] [formerly 532d3ee899
[formerly 4f3ea80cd9
[formerly 534a1d6d9cb2366d875f5361c2a30fce54b7f786]]]
Former-commit-id: 532d3ee899
Former-commit-id: c5cdb4c1995968d035037728d9402432a84f1606 [formerly f95037a9bf
]
Former-commit-id: 545fe43c1e
2013-05-29 16:20:17 -05:00
Nate Jensen
fde771fa01
Issue #1989 remove unused schemas
...
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594
Former-commit-id: 00fbfbe7e5
[formerly 740237c317
] [formerly f3258e77f7
] [formerly fc691cbb2f
[formerly f3258e77f7
[formerly b0ad25ccd9e20b6bf994a3a46ce38298c363adff]]]
Former-commit-id: fc691cbb2f
Former-commit-id: 6a77f3b7c59562087d1ad4760e65958bf6aabb34 [formerly 6214f529a7
]
Former-commit-id: ab10e0072d
2013-05-29 16:19:28 -05:00
Dustin Johnson
dc87184caf
Merge "Issue #2038 Fix deleting of multiple subscription types Update test Spring configurations" into development
...
Former-commit-id: de43cbb63d
[formerly 8ae3e74339
] [formerly b0348bc056
] [formerly 2554ff9602
[formerly b0348bc056
[formerly 5716e1dbbbbe67cdde980eab6b60a70e22283ee9]]]
Former-commit-id: 2554ff9602
Former-commit-id: f5be6d72f3c14e4ac4a2a46ab2fcccc186c6ab49 [formerly 05d5a08497
]
Former-commit-id: 4741aca6b1
2013-05-29 16:02:55 -05:00
Dustin Johnson
efd95f253e
Issue #2038 Fix deleting of multiple subscription types
...
Update test Spring configurations
Change-Id: I63a6d12b03768223a86c1a309bc438758bb61f2e
Former-commit-id: 63ccc2c133
[formerly 21b8f03b1f
] [formerly d2d50e7d8b
] [formerly ecf3f2e300
[formerly d2d50e7d8b
[formerly a862a4d1b9b34b3f93e54480b9fc482a234db918]]]
Former-commit-id: ecf3f2e300
Former-commit-id: 1540347e93b929ac41c7a779cb0a5461b2ed43ed [formerly 151df64a6e
]
Former-commit-id: d467832855
2013-05-29 15:54:06 -05:00
Nate Jensen
c641738561
Issue #1989 fix for webpages
...
Change-Id: I998ddac47050620aa9ee07448a8e63d7d37215c7
Former-commit-id: fb9ca3cbc5
[formerly c0e93d192c
] [formerly 1a34067182
] [formerly 0d495f9759
[formerly 1a34067182
[formerly 7880f21755384540d3bca4ac15b04932455b8fd8]]]
Former-commit-id: 0d495f9759
Former-commit-id: 0657d80aa35f0603c65e07b37e2a945da508ec20 [formerly 8da746cde6
]
Former-commit-id: 839e9fc76d
2013-05-29 15:21:10 -05:00
Ben Steffensmeier
4555ef990c
Issue #1869 fix plot updates, broken by earlier commit.
...
Former-commit-id: a3b2efc2b4
[formerly b32a5b1c00
] [formerly d2e01ee1f2
] [formerly cbc3b0a9a4
[formerly d2e01ee1f2
[formerly a9240b60e4643b43880d2be76580dc85999eb897]]]
Former-commit-id: cbc3b0a9a4
Former-commit-id: 060cda1b75778126734603e80699b9f5cae37ac8 [formerly d90ca1696e
]
Former-commit-id: 6b7958c834
2013-05-29 15:00:04 -05:00
Nate Jensen
3a41ae85b4
Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
...
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3
Former-commit-id: 04d6f6654d
[formerly 927da5cffb
] [formerly 99b4a21414
] [formerly 3f3e0a788d
[formerly 99b4a21414
[formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]]
Former-commit-id: 3f3e0a788d
Former-commit-id: d0138025d23b33df24fb8ba7acc2f8deacce3bcc [formerly a1f314948f
]
Former-commit-id: b025262dc1
2013-05-29 14:49:43 -05:00
Nate Jensen
043cc9f661
Issue #1989 remove high memory mode, reorganize wrapper.conf
...
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f
Former-commit-id: 6a6484cbb2
[formerly 7059967ae9
] [formerly caf414bab0
] [formerly 148b20f57c
[formerly caf414bab0
[formerly 19d32f4ffee269e244b77988f908a8e263374430]]]
Former-commit-id: 148b20f57c
Former-commit-id: 6fba3fb4deea335c4acb90a32e69115895b885af [formerly 72ed3e21b3
]
Former-commit-id: 47d2bf99b9
2013-05-29 12:06:15 -05:00
Benjamin Phillippe
a05a910ef9
Issue #2036 Implemented federated query capabilities
...
Change-Id: I0a729281a1b08267486a9d5fdddd876ededf6e69
Former-commit-id: ec9881b914
[formerly e16dc02a54
] [formerly e7f17cb73caba0c3830169a9b341f90b58134c89 [formerly 4747f7d319
]] [formerly d5263b2b75
[formerly 4747f7d319
[formerly eac19de99604769ad8d9bb4f53c6ffce95903d9a]]]
Former-commit-id: d5263b2b75
Former-commit-id: c7f0b0ec8eb2ed167a7e9c3286f24e4c5995969f [formerly 7cca4d8794
]
Former-commit-id: c6af8b4d7c
2013-05-29 10:34:22 -05:00
Dustin Johnson
6567c1b6ef
Merge "Issue #2038 More information when bandwidth manager can't schedule a subscription" into development
...
Former-commit-id: 605f2d6136
[formerly 7ca6f18405
] [formerly 66c941fc3f
] [formerly ac292f1242
[formerly 66c941fc3f
[formerly 346f09f53275928fc43d86dd41d7edd519581caf]]]
Former-commit-id: ac292f1242
Former-commit-id: af8ec40bf2a2deea1a0f9f9b2f678d19fe42a9df [formerly ef43634c56
]
Former-commit-id: b6c87f42b1
2013-05-29 09:27:30 -05:00
Richard Peter
6d11397746
Merge "Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables" into development
...
Former-commit-id: 16c3723df8
[formerly 6dd22b6dfa
] [formerly bc0f1c88fc
] [formerly 19272c9f28
[formerly bc0f1c88fc
[formerly 3a8cb92490910e22e3a9f9247de1748a18686c84]]]
Former-commit-id: 19272c9f28
Former-commit-id: f547c20d9919ea9e58a5d840b157b5c4ea811426 [formerly 4be6514b57
]
Former-commit-id: d26eac7bdf
2013-05-29 09:26:10 -05:00
Nate Jensen
768a7dad60
Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables
...
Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c
Former-commit-id: cf705759bd
[formerly 808ab352c5
] [formerly 82d6c03669
] [formerly 36bc35b5c8
[formerly 82d6c03669
[formerly 281edabb772b68e80bf6a9456f3a8e19576ed7da]]]
Former-commit-id: 36bc35b5c8
Former-commit-id: db577cfe4bfa8cdfe3ef347e55233cf887e454bd [formerly cb4b66d37a
]
Former-commit-id: 452858b86f
2013-05-29 09:20:53 -05:00
Mike Duff
d292cfcca0
Issue #2016 - fix TS Trace toggle
...
Change-Id: I740c75861ac81daaac69a0c70ff050079d3bbaf4
Former-commit-id: 0babd4d9b4
[formerly 51de726e49
] [formerly afbe294f4a
] [formerly 5919687484
[formerly afbe294f4a
[formerly f51f36cfc63a8e75f8a72bb202d1389594865466]]]
Former-commit-id: 5919687484
Former-commit-id: 22647bf8f0aa609c257a8ef84d9b763053337b5e [formerly 66f4e6fe87
]
Former-commit-id: d9fd9d297b
2013-05-29 09:15:46 -05:00
Dustin Johnson
fb15a3e115
Issue #2038 More information when bandwidth manager can't schedule a subscription
...
Amend: Peer review comments
Change-Id: If2ae3f98a3a04709c2cdc7632ca89f2ee6a5e08d
Former-commit-id: eef3b4c750
[formerly c76fa3bc2a
] [formerly 0a9e7ed740
] [formerly 31e01a9f9a
[formerly 0a9e7ed740
[formerly b1414f6aebda59cb6d83d1f0d0154fa4cd850953]]]
Former-commit-id: 31e01a9f9a
Former-commit-id: c0c794b2f4803e4344ff77a743a2e92ff060ff70 [formerly 187a1e49ef
]
Former-commit-id: fff0172786
2013-05-29 09:02:47 -05:00
Nate Jensen
8c756705c5
Merge "Issue #1967 fix annoying warnings, remove unused preferences page" into development
...
Former-commit-id: d7391928f9
[formerly ba5e69c7ff
] [formerly 7c1e6e8b09
] [formerly 256a67a9f9
[formerly 7c1e6e8b09
[formerly 8e487eda5b9c31bca2e03ee0d129d42fa38bf55e]]]
Former-commit-id: 256a67a9f9
Former-commit-id: 729de173162ed2d04e927cd7b463d674c8aac59e [formerly 2fe1960ebb
]
Former-commit-id: ac838f62dd
2013-05-28 15:43:31 -05:00
Nate Jensen
74bce32a88
Merge "Issue #1638 Fixed text box drawn to be correct size with padding around text" into development
...
Former-commit-id: 5748201316
[formerly cba08666e6
] [formerly 053e37ee76
] [formerly e846e539fb
[formerly 053e37ee76
[formerly e12bf41edb19fb38673057ea5a1633953e5ebdf3]]]
Former-commit-id: e846e539fb
Former-commit-id: 00638cbac9800172a1c3e7bb571d3fdb66dc2446 [formerly 5c60582df2
]
Former-commit-id: 607e980d45
2013-05-28 15:43:23 -05:00
Max Schenkelberg
b2a9cba9c7
Issue #1638 Fixed text box drawn to be correct size with padding around text
...
Amend: Fixed format string issues with topo resource and colorbar labels
Change-Id: I978a5f518dbae50eeded25ad0deab6a067b28114
Former-commit-id: 98bdd5f786
[formerly a88ca5e983
] [formerly 13ff44fdee
] [formerly 3175563336
[formerly 13ff44fdee
[formerly aa8c0a8573188f241575ac212a876eb3b630da9a]]]
Former-commit-id: 3175563336
Former-commit-id: dd33ea8ed195002c13b9b3e4e8d6d9dda70e2d8e [formerly 9932114218
]
Former-commit-id: 4e8d25b317
2013-05-28 15:00:59 -05:00
Nate Jensen
e94a5b5494
Issue #1967 fix annoying warnings, remove unused preferences page
...
Change-Id: I9f7a5ef09f67165b4a3eca023f646f24efbe10e0
Former-commit-id: d479912981
[formerly bd8431b986
] [formerly ed7b0fc8c5
] [formerly 3f85aeb00a
[formerly ed7b0fc8c5
[formerly e3acc289aa835326bac7af9d10b7b5909c7c07f6]]]
Former-commit-id: 3f85aeb00a
Former-commit-id: 755dd253bb4939ea763815cd0328c8e0a0f2daca [formerly 0b48f54f47
]
Former-commit-id: f7817d7c41
2013-05-28 14:30:26 -05:00
Roger Ferrel
618feeda6d
Issue #1966 Changes to CategoryConfig to make parsing more efficent.
...
Change-Id: I3fc9bf03eccea8ae63cb37a4469e512c1fac9e87
Former-commit-id: 24f1c70168
[formerly 365af6b7ce
] [formerly cbee731447
] [formerly 9263b54845
[formerly cbee731447
[formerly d8a510b87d026d57eb282583c4cf2f786749dc95]]]
Former-commit-id: 9263b54845
Former-commit-id: e443885c0974b7dc457a2ea698d05b926b780848 [formerly fce5c2ca1e
]
Former-commit-id: 838eacc802
2013-05-28 13:21:08 -05:00
Max Schenkelberg
ae669fec59
Issue #1638 Added support for null search constraints for updates
...
Amend: Fixed comment, added SW history
Change-Id: Ie8fb8b308bc77976838c6fa36fba9746cfb0a515
Former-commit-id: a91db9c1e3
[formerly 21693d6913
] [formerly 1bc4437154
] [formerly 807e4501c8
[formerly 1bc4437154
[formerly 9fb8f08aa2068b9249b09ccba555907c40541217]]]
Former-commit-id: 807e4501c8
Former-commit-id: 1bee1ded94bdf16e7d08cd81e11f8d384dfa0585 [formerly 036b11c84e
]
Former-commit-id: 6c9fedb312
2013-05-28 12:59:27 -05:00