Commit Graph

6674 Commits

Author SHA1 Message Date
Guillaume Polaert 09721bb8ca Merge remote-tracking branch 'origin/dev' into dev 2017-06-02 16:33:21 +02:00
Guillaume Polaert 312e3281c9 Help some lost souls 2017-06-02 16:32:51 +02:00
Guillaume Polaert bd6eb7d725 Improving pom.xnml (shade) 2017-06-02 16:14:34 +02:00
Guillaume Polaert 13a5ae5666 Ignoring files 2017-06-02 11:03:22 +02:00
renaudboutet 96d4f10c87 Resolve conflicts 2017-06-01 18:39:49 +02:00
renaudboutet a48ff4c3c9 Refine HTTP client instrumentation versions + finner logging 2017-06-01 18:38:08 +02:00
Guillaume Polaert 777c0841aa typo in class name 2017-06-01 16:44:01 +02:00
Guillaume Polaert db2a59fea7 [maven-release-plugin] prepare for next development iteration 2017-06-01 15:18:24 +02:00
Guillaume Polaert b24a186cba [maven-release-plugin] prepare release v0.0.3 2017-06-01 15:18:18 +02:00
Guillaume Polaert 913acc9ec7 clean config 2017-06-01 15:16:02 +02:00
renaudboutet 470ddac5fb Fix logging 2017-06-01 15:12:34 +02:00
renaudboutet cf90b839d2 Added JarVersions sanity check with auto-disabling capabilities 2017-06-01 15:05:34 +02:00
Renaud Boutet 5963042e60 Merge pull request #8 from DataDog/refactor-skel
refactoring skel
2017-06-01 11:05:16 +02:00
Guillaume Polaert cbf4e0faa0 updating manualy some dep issues 2017-05-31 16:27:42 +02:00
Guillaume Polaert c4f35a9a5a updating manualy some dep issues 2017-05-31 15:51:39 +02:00
Guillaume Polaert fcb214b921 fix version deps 2017-05-31 15:37:06 +02:00
Guillaume Polaert 1bb36a82af [maven-release-plugin] prepare for next development iteration 2017-05-31 15:31:26 +02:00
Guillaume Polaert 69b620725e [maven-release-plugin] prepare release v0.0.2 2017-05-31 15:31:09 +02:00
Guillaume Polaert 1a41751e34 refactoring skel 2017-05-31 15:25:02 +02:00
Guillaume Polaert 83a30ad181 Merge remote-tracking branch 'origin/master' into dev 2017-05-31 13:06:25 +02:00
Guillaume Polaert 78baebe447 [maven-release-plugin] prepare for next development iteration 2017-05-31 12:30:48 +02:00
Guillaume Polaert 9e0077d46a [maven-release-plugin] prepare release v0.0.1 2017-05-31 12:30:42 +02:00
Guillaume Polaert eeab45af29 fix javadocs issues 2017-05-31 12:28:51 +02:00
Guillaume Polaert 667111582c fixing ossrh issues again 2017-05-31 12:22:38 +02:00
Guillaume Polaert b11bc289fe fixing version issue 2017-05-31 12:05:57 +02:00
Guillaume Polaert 34d07b1a75 fixing ossrh issues 2017-05-31 12:02:40 +02:00
Guillaume Polaert 376baf03c6 [maven-release-plugin] prepare release v0.0.1 2017-05-31 11:44:47 +02:00
Guillaume Polaert 2959276459 fix issues on pom 2017-05-31 11:33:41 +02:00
Guillaume Polaert db8b80fb92 still trying to release 2017-05-31 11:31:17 +02:00
Guillaume Polaert 4cb4dbb941 skip deploy for parents 2017-05-31 10:50:18 +02:00
Guillaume Polaert 533d5f98b7 fix javadoc issues 2017-05-31 10:07:01 +02:00
Guillaume Polaert 982cf29250 fixing javadoc issues 2017-05-31 10:03:49 +02:00
Guillaume Polaert eecf93be0e fixing pom issues for the release 2017-05-31 09:58:36 +02:00
Albert Wang d7b4751376 more grammar changes 2017-05-30 07:14:48 -10:00
Albert Wang 9552ad3618 small grammar changes 2017-05-30 07:08:44 -10:00
Renaud Boutet 5d911e5474 Merge pull request #6 from DataDog/dev
Alpha release
2017-05-30 18:51:17 +02:00
Guillaume Polaert dad2391838 fix issues on pom 2017-05-30 16:51:39 +02:00
renaudboutet 8950008357 Merge remote-tracking branch 'origin/merge-validation' into dev 2017-05-30 15:13:10 +02:00
renaudboutet 96e98e3567 New feature: disabling instrumentations 2017-05-30 15:12:18 +02:00
Guillaume Polaert 7078e2a001 merge 2017-05-30 14:18:22 +02:00
Guillaume Polaert 9c38391a58 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	dd-trace/src/main/java/com/datadoghq/trace/resolver/DDTracerFactory.java
2017-05-30 14:12:35 +02:00
Guillaume Polaert 54597d3edf Refactor the configuration 2017-05-30 14:09:04 +02:00
renaudboutet 0265abd9a7 Merge branch 'dev' of github.com:DataDog/dd-trace-java into dev 2017-05-30 12:44:18 +02:00
renaudboutet 7587b284df Move back resolver in core + added the skipTagsPatterns option over samplers (+tests & examples) 2017-05-30 12:44:10 +02:00
Guillaume Polaert b3d7f3afc6 Remove ES 2017-05-30 11:51:27 +02:00
Guillaume Polaert 4e1c461eff fix urls 2017-05-30 11:42:01 +02:00
Guillaume Polaert 59ba88ac2d fix urls 2017-05-30 11:40:51 +02:00
Guillaume Polaert fabe2c338a Make it cleaner 2017-05-30 11:39:36 +02:00
Guillaume Polaert 8180a9cd0d Make it cleaner 2017-05-30 10:18:25 +02:00
renaudboutet 26342e48d9 Fix refactored decorators + ErrorFlag + DBStatement decorator + DDapi is streaming JSON (optim) 2017-05-29 19:17:44 +02:00