Timothy Sullivan
|
f7a69c4e02
|
Merge remote-tracking branch 'upstream/2.1'
Original commit: elastic/x-pack-elasticsearch@516478e333
|
2015-11-24 09:26:23 -07:00 |
|
debadair
|
611db9ba17
|
Fixing conflicts with Master
Original commit: elastic/x-pack-elasticsearch@63396e9588
|
2015-11-23 14:00:48 -08:00 |
|
debadair
|
bfbf8a252d
|
Fixed conflict in intro.
Original commit: elastic/x-pack-elasticsearch@eee009f4c1
|
2015-11-23 13:48:01 -08:00 |
|
debadair
|
3aa3376ca6
|
Docs: Bumped version number to 2.1.0 and added 2.1.0 release notes.
Original commit: elastic/x-pack-elasticsearch@e39cf3e654
|
2015-11-23 11:55:40 -08:00 |
|
debadair
|
e4b7f6af94
|
Docs: Bumped version number to 2.1.0 and added 2.1.0 release notes.
Original commit: elastic/x-pack-elasticsearch@dc99f25899
|
2015-11-23 11:53:43 -08:00 |
|
Tim Sullivan
|
9c19d82b77
|
Merge pull request elastic/elasticsearch#666 from simianhacker/2.1
Minor Adjustments for the Nodes Formats from the Plugin
Original commit: elastic/x-pack-elasticsearch@6260bf7c9a
|
2015-11-19 18:46:22 -07:00 |
|
Chris Cowan
|
932ed158de
|
Fixing issue with nodes
Original commit: elastic/x-pack-elasticsearch@d8ef1d6023
|
2015-11-19 17:27:42 -06:00 |
|
Tim Sullivan
|
992c601a7b
|
Merge pull request elastic/elasticsearch#647 from simianhacker/rest-refactor
Remove Time Picker for Clusters Listing Page
Original commit: elastic/x-pack-elasticsearch@89bf0c210e
|
2015-11-11 23:09:55 -07:00 |
|
Tim Sullivan
|
22d1307134
|
Merge pull request elastic/elasticsearch#645 from panda01/enhance/node-offline-status
Enhance/node offline status
Original commit: elastic/x-pack-elasticsearch@d2c125cf63
|
2015-11-11 13:42:23 -07:00 |
|
Khalah Jones-Golden
|
47df543c52
|
Merge remote-tracking branch 'upstream/2.1' into enhance/node-offline-status
Original commit: elastic/x-pack-elasticsearch@1f60bfb379
|
2015-11-11 11:37:10 -04:00 |
|
Tim Sullivan
|
fcc553220c
|
Merge pull request elastic/elasticsearch#639 from tsullivan/chris-rest-refactor
Refactoring to REST architecture for single point of data retrieval from front-end controllers
Original commit: elastic/x-pack-elasticsearch@3734c48709
|
2015-11-10 07:36:08 -07:00 |
|
Tim Sullivan
|
8895f95cb4
|
Merge pull request elastic/elasticsearch#619 from panda01/master
Update Readme
Original commit: elastic/x-pack-elasticsearch@8061235189
|
2015-11-10 07:06:21 -07:00 |
|
Khalah Jones-Golden
|
a8e5dee9b5
|
Merge remote-tracking branch 'upstream/master'
Original commit: elastic/x-pack-elasticsearch@c983d808bb
|
2015-11-09 16:31:58 -04:00 |
|
Chris Cowan
|
04dc3d4c91
|
Merge branch 'chris-rest-refactor' of github.com:tsullivan/elasticsearch-marvel into rest-refactor
Original commit: elastic/x-pack-elasticsearch@f05242978f
|
2015-11-05 14:09:51 -07:00 |
|
Chris Cowan
|
f84d2481f3
|
Initial indexing for nodes
Original commit: elastic/x-pack-elasticsearch@45988280b7
|
2015-11-05 14:09:19 -07:00 |
|
Chris Cowan
|
695be800ef
|
Merge branch '2.1' of github.com:elasticsearch/elasticsearch-marvel into rest-refactor
Original commit: elastic/x-pack-elasticsearch@236829a082
|
2015-11-04 09:58:43 -07:00 |
|
Chris Cowan
|
1eceb0b568
|
Merge branch 'rest-refactor' of github.com:simianhacker/elasticsearch-marvel into rest-refactor
Original commit: elastic/x-pack-elasticsearch@897e1a0ad0
|
2015-11-04 09:57:10 -07:00 |
|
Chris Cowan
|
c0edaca67b
|
Fixing recovery indexer
Original commit: elastic/x-pack-elasticsearch@cd39dd8ac0
|
2015-11-04 09:55:52 -07:00 |
|
Chris Cowan
|
dacfe77365
|
Merge branch '2.1' of github.com:elasticsearch/elasticsearch-marvel into rest-refactor
Original commit: elastic/x-pack-elasticsearch@3ac660d147
|
2015-11-04 09:49:35 -07:00 |
|
Tim Sullivan
|
ae8b7afe22
|
Merge pull request elastic/elasticsearch#638 from simianhacker/indexer-fixes
Fix Index Recovery Process
Original commit: elastic/x-pack-elasticsearch@4c7956fdd7
|
2015-11-04 09:47:18 -07:00 |
|
Chris Cowan
|
13ee16c1d5
|
Fixing recovery indexer
Original commit: elastic/x-pack-elasticsearch@d045a4a805
|
2015-11-03 13:44:00 -07:00 |
|
Khalah Jones-Golden
|
274d217fa5
|
[Readme] Closes elastic/elasticsearch#575. Updated the readme to accomodate for new design
Original commit: elastic/x-pack-elasticsearch@df76fcc082
|
2015-10-27 14:49:38 -04:00 |
|
Chris Cowan
|
1a65258000
|
Merge pull request elastic/elasticsearch#574 from panda01/master
Expired License Page
Original commit: elastic/x-pack-elasticsearch@3404d38eb0
|
2015-10-12 10:50:49 -07:00 |
|
Khalah Jones-Golden
|
fa310087ba
|
Merge remote-tracking branch 'upstream/master'
Original commit: elastic/x-pack-elasticsearch@9652147fc2
|
2015-10-09 19:08:37 -04:00 |
|
Khalah Jones Golden
|
e962e6a5fb
|
Merge pull request elastic/elasticsearch#547 from tsullivan/add-google-analytics-tag
Add google analytics tag
Original commit: elastic/x-pack-elasticsearch@2fdf44bdee
|
2015-10-08 20:00:35 -04:00 |
|
Chris Cowan
|
2229058832
|
Merge branch 'master' of github.com:elasticsearch/elasticsearch-marvel into add-google-analytics-tag
Original commit: elastic/x-pack-elasticsearch@925de4d2f4
|
2015-10-08 14:30:35 -07:00 |
|
Chris Cowan
|
4c2ea72201
|
Merge pull request elastic/elasticsearch#560 from kjbekkelund/gulpfile-cleanup
Gulpfile cleanup
Original commit: elastic/x-pack-elasticsearch@a820ad2649
|
2015-10-08 11:12:13 -07:00 |
|
Chris Cowan
|
c04d6b882d
|
Merge pull request elastic/elasticsearch#564 from panda01/master
Some fixes
Original commit: elastic/x-pack-elasticsearch@fb17bbf650
|
2015-10-08 11:09:18 -07:00 |
|
Chris Cowan
|
fdaca47946
|
Merge pull request elastic/elasticsearch#565 from epixa/fix-marvel-install-readme
Fix incorrect install command in readme
Original commit: elastic/x-pack-elasticsearch@45bf83a3ab
|
2015-10-08 10:44:47 -07:00 |
|
Court Ewing
|
53cad5f3c8
|
Fix incorrect install command in readme
Original commit: elastic/x-pack-elasticsearch@c0e292ed3e
|
2015-10-08 11:16:55 -04:00 |
|
Tim Sullivan
|
b32874e840
|
Merge pull request elastic/elasticsearch#551 from simianhacker/gulp-package
Build Tasks for Gulpfile
Original commit: elastic/x-pack-elasticsearch@01e64ae2a2
|
2015-09-24 13:53:10 -07:00 |
|
Chris Cowan
|
8c4502d8f8
|
Merge branch 'master' of github.com:elasticsearch/elasticsearch-marvel into gulp-package
Original commit: elastic/x-pack-elasticsearch@2818197f3a
|
2015-09-24 13:43:29 -07:00 |
|
Khalah Jones Golden
|
55b8534d27
|
Merge pull request elastic/elasticsearch#535 from simianhacker/shield-integration
Shield Integration
Original commit: elastic/x-pack-elasticsearch@b7d61d994e
|
2015-09-24 14:50:22 -04:00 |
|
Tim Sullivan
|
9e02c2ece6
|
Merge pull request elastic/elasticsearch#552 from panda01/master
Disable deleted indices
Original commit: elastic/x-pack-elasticsearch@e014e7aae9
|
2015-09-24 10:09:37 -07:00 |
|
Khalah Jones-Golden
|
ccbaae20d8
|
[cleanup] used less variables, cleaned up and made more clean Contributing.md
Original commit: elastic/x-pack-elasticsearch@724bb509ec
|
2015-09-24 09:21:26 -04:00 |
|
Khalah Jones-Golden
|
0feb382737
|
[Contributing] Started a contributing doc
Original commit: elastic/x-pack-elasticsearch@3a29d1b360
|
2015-09-23 17:58:01 -04:00 |
|
Tim Sullivan
|
9b1df7d900
|
Merge pull request elastic/elasticsearch#548 from simianhacker/welcome-message
Adding Welcome Message to Overview Page
Original commit: elastic/x-pack-elasticsearch@997b7efdac
|
2015-09-23 09:37:36 -07:00 |
|
Chris Cowan
|
6a3ff5e8f7
|
Merge branch 'master' into shield-integration
Original commit: elastic/x-pack-elasticsearch@8c443530a0
|
2015-09-23 09:00:00 -07:00 |
|
Tim Sullivan
|
7d88671aa2
|
Merge pull request elastic/elasticsearch#545 from simianhacker/remove-marvel-prefix
Remove marvel_ prefix for all doc types
Original commit: elastic/x-pack-elasticsearch@1251b0f009
|
2015-09-23 08:27:51 -07:00 |
|
Chris Cowan
|
d28e337689
|
Closes elastic/elasticsearch#534 - Remove marvel_ prefix for all doc types
Original commit: elastic/x-pack-elasticsearch@bdea3f915f
|
2015-09-22 10:48:29 -07:00 |
|
Chris Cowan
|
f0a160000e
|
Merge pull request elastic/elasticsearch#531 from tsullivan/handle-missing-nodeIndex
fix - handle missing nodeIndex on node detail page
Original commit: elastic/x-pack-elasticsearch@86624d845a
|
2015-09-21 11:43:31 -07:00 |
|
Khalah Jones Golden
|
457112250d
|
Merge pull request elastic/elasticsearch#538 from panda01/master
Metrics improvements
Original commit: elastic/x-pack-elasticsearch@c015d6baec
|
2015-09-21 13:58:03 -04:00 |
|
Tim Sullivan
|
4a46991d62
|
Merge pull request elastic/elasticsearch#532 from simianhacker/index-detail-metrics
Index Detail Metrics
Original commit: elastic/x-pack-elasticsearch@e4f401080a
|
2015-09-21 10:07:59 -07:00 |
|
Khalah Jones Golden
|
e4947575f2
|
Merge pull request elastic/elasticsearch#525 from simianhacker/index-overview-metrics
Index Overview Metrics
Original commit: elastic/x-pack-elasticsearch@cbd82d924f
|
2015-09-21 07:41:39 -04:00 |
|
Tim Sullivan
|
b727a18dfa
|
Merge pull request elastic/elasticsearch#533 from panda01/master
Some small bug fixes
Original commit: elastic/x-pack-elasticsearch@2f1abb455e
|
2015-09-18 13:02:31 -07:00 |
|
Tim Sullivan
|
e7e47214f6
|
Merge pull request elastic/elasticsearch#523 from simianhacker/node-detail-stats
Finalize Node Stats
Original commit: elastic/x-pack-elasticsearch@a142eddd56
|
2015-09-18 11:56:11 -07:00 |
|
Chris Cowan
|
5b72d28557
|
Merge branch 'master' into node-detail-stats
Original commit: elastic/x-pack-elasticsearch@30869d1556
|
2015-09-17 10:53:58 -07:00 |
|
Chris Cowan
|
a5cfeef811
|
Merge branch 'master' into node-detail-stats
Original commit: elastic/x-pack-elasticsearch@ab2bc389a0
|
2015-09-17 09:21:27 -07:00 |
|
Chris Cowan
|
0fa6791690
|
Merge pull request elastic/elasticsearch#512 from tsullivan/pagination-component
React Pagination component updates
Original commit: elastic/x-pack-elasticsearch@59bfede078
|
2015-09-17 08:19:04 -07:00 |
|
Chris Cowan
|
2c7d57bfef
|
Merge branch 'master' of github.com:elasticsearch/elasticsearch-marvel into node-detail-stats
Original commit: elastic/x-pack-elasticsearch@5876aa4e56
|
2015-09-17 08:11:43 -07:00 |
|