You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by pa...@apache.org on 2016/03/10 10:48:33 UTC

[2/6] falcon git commit: Deleting accidental check-in of trunk/release/master

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/EntityDependencies.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/EntityDependencies.twiki b/trunk/releases/master/src/site/twiki/restapi/EntityDependencies.twiki
deleted file mode 100644
index 864b084..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/EntityDependencies.twiki
+++ /dev/null
@@ -1,43 +0,0 @@
----++  GET /api/entities/dependencies/:entity-type/:entity-name
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-Get dependencies of the entity.
-
----++ Parameters
-   * :entity-type can be cluster, feed or process.
-   * :entity-name is name of the entity.
-   * doAs <optional query param> allows the current user to impersonate the user passed in doAs when interacting with the Falcon system.
-
----++ Results
-Dependenciess of the entity.
-
----++ Examples
----+++ Rest Call
-<verbatim>
-GET http://localhost:15000/api/entities/dependencies/process/SampleProcess?doAs=joe
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "entity": [
-        {
-            "name": "SampleInput",
-            "type": "feed",
-            "tag": [Input]
-        },
-        {
-            "name": "SampleOutput",
-            "type": "feed"
-            "tag": [Output]
-        },
-        {
-            "name": "primary-cluster",
-            "type": "cluster"
-        }
-    ]
-}
-</verbatim>

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/EntityLineage.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/EntityLineage.twiki b/trunk/releases/master/src/site/twiki/restapi/EntityLineage.twiki
deleted file mode 100644
index f2258f2..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/EntityLineage.twiki
+++ /dev/null
@@ -1,40 +0,0 @@
----++  GET api/metadata/lineage/entities?pipeline=:pipeline
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-It returns the graph depicting the relationship between the various processes and feeds in a given pipeline.
-
----++ Parameters
-   * :pipeline is the name of the pipeline
-   * doAs <optional query param> allows the current user to impersonate the user passed in doAs when interacting with the Falcon system.
-
----++ Results
-It returns a json graph
-
----++ Examples
----+++ Rest Call
-<verbatim>
-GET http://localhost:15000/api/metadata/lineage/entities?pipeline=my-pipeline&doAs=joe
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "vertices": ["my-minutely-process", "my-hourly-process"],
-    "edges":
-    [
-        {
-         "from"  : "my-minutely-process",
-         "to"    : "my-hourly-process",
-         "label" : "my-minutely-feed"
-        },
-        {
-         "from"  : "my-hourly-process",
-         "to"    : "my-minutely-process",
-         "label" : "my-hourly-feedback"
-        }
-    ]
-}
-</verbatim>

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/EntityList.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/EntityList.twiki b/trunk/releases/master/src/site/twiki/restapi/EntityList.twiki
deleted file mode 100644
index 2c2a734..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/EntityList.twiki
+++ /dev/null
@@ -1,164 +0,0 @@
----++  GET /api/entities/list/:entity-type?fields=:fields
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-Get list of the entities.
-
----++ Parameters
-   * :entity-type Comma-separated entity types. Can be empty. Valid entity types are cluster, feed or process.
-   * fields <optional param> Fields of entity that the user wants to view, separated by commas.
-      * Valid options are STATUS, TAGS, PIPELINES, CLUSTERS.
-   * nameseq <optional param> Subsequence of entity name. Not case sensitive.
-      * The entity name needs to contain all the characters in the subsequence in the same order.
-      * Example 1: "sample1" will match the entity named "SampleFeed1-2".
-      * Example 2: "mhs" will match the entity named "New-My-Hourly-Summary".
-   * tagkeys <optional param> Keywords in tags, separated by comma. Not case sensitive.
-      * The returned entities will have tags that match all the tag keywords.
-   * filterBy <optional param> Filter results by list of field:value pairs. Example: filterBy=STATUS:RUNNING,PIPELINES:clickLogs
-      * Supported filter fields are NAME, STATUS, PIPELINES, CLUSTER.
-      * Query will do an AND among filterBy fields.
-   * tags <optional param> Return list of entities that have specified tags, separated by a comma. Query will do AND on tag values.
-      * Example: tags=consumer=consumer@xyz.com,owner=producer@xyz.com
-   * orderBy <optional param> Field by which results should be ordered.
-      * Supports ordering by "name".
-   * sortOrder <optional param> Valid options are "asc" and "desc"
-   * offset <optional param> Show results from the offset, used for pagination. Defaults to 0.
-   * numResults <optional param> Number of results to show per request, used for pagination. Only integers > 0 are valid, Default is 10.
-   * doAs <optional query param> allows the current user to impersonate the user passed in doAs when interacting with the Falcon system.
-   * Note:
-      * We have two filtering parameters for entity tags: "tags" and "tagkeys". "tags" does the exact match in key=value fashion, while "tagkeys" finds all the entities with the given key as a substring in the tags. This "tagkeys" filter is introduced for the user who doesn't remember the exact tag but some keywords in the tag. It also helps users to save the time of typing long tags.
-      * The returned entities will match all the filtering criteria.
-
----++ Results
-Total number of results and a list of entities.
-
----++ Examples
----+++ Rest Call
-<verbatim>
-GET http://localhost:15000/api/entities/list/feed
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "totalResults":"2”,
-    "entity": [
-        {
-            "name": "SampleOutput",
-            "type": "feed"
-        },
-        {
-            "name": "SampleInput",
-            "type": "feed"
-        }
-    ]
-}
-</verbatim>
-
----+++ Rest Call
-<verbatim>
-GET http://localhost:15000/api/entities/list
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "totalResults":"4”,
-    "entity": [
-        {
-            "name"  : "SampleCluster1",
-            "type"  : "cluster"
-        }
-        {
-            "name"  : "SampleOutput",
-            "type"  : "feed"
-        },
-        {
-            "name"  : "SampleInput",
-            "type"  : "feed"
-        }
-        {
-            "name"  : "SampleProcess1",
-            "type"  : "process"
-        }
-    ]
-}
-</verbatim>
-
----+++ Rest Call
-<verbatim>
-GET http://localhost:15000/api/entities/list/feed?fields=status
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "totalResults":"2”,
-    "entity": [
-        {
-            "name"  : "SampleOutput",
-            "type"  : "feed",
-            "status": "RUNNING"
-        },
-        {
-            "name": "SampleInput",
-            "type": "feed",
-            "status": "RUNNING"
-        }
-    ]
-}
-</verbatim>
-
----+++ Rest Call
-<verbatim>
-GET http://localhost:15000/api/entities/list/process?filterBy=STATUS:RUNNING,PIPELINES:dataReplication&fields=status,pipelines,tags&tags=consumer=consumer@xyz.com&orderBy=name&offset=2&numResults=2
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "totalResults":"10”,
-    "entity": [
-        {
-            "name"  : "SampleProcess1",
-            "type"  : "process",
-            "status": "RUNNING",
-            "pipelines": "dataReplication",
-            "tags": "consumer=consumer@xyz.com"
-        },
-        {
-            "name": "SampleProcess3",
-            "type": "process",
-            "status": "RUNNING",
-            "pipelines": "dataReplication",
-            "tags": "consumer=consumer@xyz.com,owner=producer@xyz.com"
-        }
-    ]
-}
-</verbatim>
-
----+++ Rest Call
-<verbatim>
-GET http://localhost:15000/api/entities/list/feed,process?nameseq=samplebill&tagkeys=billing,healthcare&numResults=2&offset=1&fields=status,clusters,tags&doAs=joe
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "totalResults":"4”,
-    "entity”:[
-        {
-            "type":"FEED”,
-            "name":"SampleUSHealthBill”,
-            "status":"SUBMITTED”,
-            "tags”: {"tag":["related=ushealthcare","department=billingDepartment"]},
-            "clusters": {"cluster":["SampleCluster1","primaryCluster”]}
-        },
-        {
-            "type":"PROCESS”,
-            "name":"SampleHealthBill”,
-            "status":"SUBMITTED”,
-            "tags”: {"tag":["related=healthcare","department=billingDepartment"]},
-            "clusters": {"cluster":"primaryCluster”}
-        }
-    ]
-}
-</verbatim>

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/EntityResume.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/EntityResume.twiki b/trunk/releases/master/src/site/twiki/restapi/EntityResume.twiki
deleted file mode 100644
index d0bbe41..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/EntityResume.twiki
+++ /dev/null
@@ -1,30 +0,0 @@
----++  POST /api/entities/resume/:entity-type/:entity-name
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-Resume a supended entity.
-
----++ Parameters
-   * :entity-type can either be a feed or a process.
-   * :entity-name is name of the entity.
-   * doAs <optional query param> allows the current user to impersonate the user passed in doAs when interacting with the Falcon system.
-
----++ Results
-Result of the resume command.
-
----++ Examples
----+++ Rest Call
-<verbatim>
-POST http://localhost:15000/api/entities/resume/process/SampleProcess?doAs=joe
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "requestId": "default\/106582a9-130f-4903-8b8f-f95d7b286c30\n",
-    "message": "default\/SampleProcess(process) resumed successfully\n",
-    "status": "SUCCEEDED"
-}
-</verbatim>

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/EntitySchedule.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/EntitySchedule.twiki b/trunk/releases/master/src/site/twiki/restapi/EntitySchedule.twiki
deleted file mode 100644
index 0dede9b..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/EntitySchedule.twiki
+++ /dev/null
@@ -1,100 +0,0 @@
----++  POST /api/entities/schedule/:entity-type/:entity-name
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-Schedule an entity.
-
----++ Parameters
-   * :entity-type can either be a feed or a process.
-   * :entity-name is name of the entity.
-   * skipDryRun : Optional query param, Falcon skips oozie dryrun when value is set to true.
-   * doAs <optional query param> allows the current user to impersonate the user passed in doAs when interacting with the Falcon system.
-   * properties <key1:val1,...,keyN:valN> : Optional query param, supplies a set of key-value pairs that will be available to the entity in the coordinator configuration. These values will not override properties with the same name predefined in the entity specification. For example, to change the scheduler used for scheduling the entity you would set the property _falcon.scheduler_ in the properties parameter to _native_ to use the Falcon Scheduler or to _oozie_ to use the Oozie Scheduler.
-
-
----++ Results
-Result of the schedule command.
-
----++ Examples
----+++ Oozie Workflow
-<verbatim>
-<workflow-app xmlns="uri:oozie:workflow:0.4" name="aggregator-wf">
-  <start to="aggregator" />
-  <action name="aggregator">
-    <java>
-      <job-tracker>${jobTracker}</job-tracker>
-      <name-node>${nameNode}</name-node>
-      <configuration>
-        <property>
-          <name>mapred.job.queue.name</name>
-          <value>${queueName}</value>
-        </property>
-      </configuration>
-      <main-class>com.company.hadoop.AggregatorJob</main-class>
-      <java-opts>-Dframework.instrumentation.host=${instrumentationServer}</java-opts>
-      <arg>--input.path=${inputBasePath}</arg>
-      <arg>--output.path=${outputBasePath}</arg>
-    </java>
-    <ok to="end" />
-    <error to="fail" />
-  </action>
-  <kill name="fail">
-    <message>Action failed, error message[${wf:errorMessage(wf:lastErrorNode())}]</message>
-  </kill>
-</workflow-app>
-</verbatim>
----+++ Submitted Process
-<verbatim>
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Daily sample process. Runs at 6th hour every day. Input - last day's hourly data. Generates output for yesterday -->
-<process xmlns="uri:falcon:process:0.1" name="SampleProcess" >
-    <clusters>
-      <cluster name="primary-cluster">
-        <validity start="2012-04-03T06:00Z" end="2022-12-30T00:00Z" />
-      </cluster>
-    </clusters>
-
-    <parallel>1</parallel>
-    <order>FIFO</order>
-    <frequency>hours(1)</frequency>
-
-    <inputs>
-        <input name="input" feed="SampleInput" start="yesterday(0,0)" end="today(-1,0)" />
-    </inputs>
-
-    <outputs>
-        <output name="output" feed="SampleOutput" instance="yesterday(0,0)" />
-    </outputs>
-
-    <properties>
-        <property name="queueName" value="default" />
-        <property name="ssh.host" value="localhost" />
-        <property name="fileTimestamp" value="${coord:formatTime(coord:nominalTime(), 'yyyy-MM-dd')}" />
-        <property name="instrumentationServer" value="${coord:conf('instrumentation.host')}" />
-    </properties>
-
-    <workflow engine="oozie" path="/examples/apps/aggregator" />
-    <retry policy="exp-backoff" delay="minutes(5)" attempts="3" />
-    
-    <late-process policy="exp-backoff" delay="hours(1)">
-        <late-input input="input" workflow-path="/projects/bootcamp/workflow/lateinput" />
-    </late-process>
-</process>
-</verbatim>
----+++ Rest Call
-<verbatim>
-POST http://localhost:15000/api/entities/schedule/process/SampleProcess?skipDryRun=false&doAs=joe&properties=instrumentation.host:intrumentation.localdomain
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "requestId": "default\/ee735c95-98bd-41b8-a705-2e78bcfcdcd9\n",
-    "message": "default\/SampleProcess(process) scheduled successfully\n",
-    "status": "SUCCEEDED"
-}
-</verbatim>
----+++ Notes
-In this example, the value of _framework.instrumentation.host_ in the Oozie workflow will be _intrumentation.localdomain_ which is the property passed when the process is scheduled.

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/EntityStatus.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/EntityStatus.twiki b/trunk/releases/master/src/site/twiki/restapi/EntityStatus.twiki
deleted file mode 100644
index 188019d..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/EntityStatus.twiki
+++ /dev/null
@@ -1,30 +0,0 @@
----++  GET /api/entities/status/:entity-type/:entity-name
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-Get status of the entity.
-
----++ Parameters
-   * :entity-type can be cluster, feed or process.
-   * :entity-name is name of the entity.
-   * doAs <optional query param> allows the current user to impersonate the user passed in doAs when interacting with the Falcon system.
-
----++ Results
-Status of the entity.
-
----++ Examples
----+++ Rest Call
-<verbatim>
-GET http://localhost:15000/api/entities/status/process/SampleProcess?doAs=joe
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "requestId": "default\/4d35b382-852a-4bc7-9972-b9db3493322a\n",
-    "message": "default\/SUBMITTED\n",
-    "status": "SUCCEEDED"
-}
-</verbatim>

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/EntitySubmit.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/EntitySubmit.twiki b/trunk/releases/master/src/site/twiki/restapi/EntitySubmit.twiki
deleted file mode 100644
index a8dc9d7..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/EntitySubmit.twiki
+++ /dev/null
@@ -1,105 +0,0 @@
----++ POST  api/entities/submit/:entity-type
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-Submit the given entity.
-
----++ Parameters
-   * :entity-type can be cluster, feed or process.
-   * doAs <optional query param> allows the current user to impersonate the user passed in doAs when interacting with the Falcon system.
-
----++ Results
-Result of the submission.
-
----++ Examples
----+++ Rest Call
-<verbatim>
-POST http://localhost:15000/api/entities/submit/feed
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Hourly sample input data -->
-
-<feed description="sample input data"
-      name="SampleInput" xmlns="uri:falcon:feed:0.1"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <groups>group</groups>
-    <frequency>hours(1)</frequency>
-    <late-arrival cut-off="hours(6)" />
-    <clusters>
-        <cluster name="primary-cluster" type="source">
-            <!--validity start="2009-01-01T00:00Z" end="2099-12-31T00:00Z" timezone="UTC" /-->
-            <validity start="2009-01-01T00:00Z" end="2099-12-31T00:00Z" />
-            <retention limit="months(24)" action="delete" />
-        </cluster>
-    </clusters>
-
-    <locations>
-        <location type="data" path="/projects/bootcamp/data/${YEAR}-${MONTH}-${DAY}-${HOUR}/SampleInput" />
-        <location type="stats" path="/projects/bootcamp/stats/SampleInput" />
-        <location type="meta" path="/projects/bootcamp/meta/SampleInput" />
-    </locations>
-
-    <ACL owner="suser" group="users" permission="0755" />
-
-    <schema location="/none" provider="none" />
-</feed>
-</verbatim>
-
----+++ Result
-<verbatim>
-{
-    "requestId": "default\/d72a41f7-6420-487b-8199-62d66e492e35\n",
-    "message": "default\/Submit successful (feed) SampleInput\n",
-    "status": "SUCCEEDED"
-}
-</verbatim>
-
----+++ Rest Call
-<verbatim>
-POST http://localhost:15000/api/entities/submit/process?doAs=joe
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Daily sample process. Runs at 6th hour every day. Input - last day's hourly data. Generates output for yesterday -->
-<process xmlns="uri:falcon:process:0.1" name="SampleProcess" >
-    <clusters>
-      <cluster name="primary-cluster">
-	<validity start="2012-04-03T06:00Z" end="2022-12-30T00:00Z" />
-      </cluster>
-    </clusters>
-
-    <parallel>1</parallel>
-    <order>FIFO</order>
-    <frequency>hours(1)</frequency>
-
-    <inputs>
-        <input name="input" feed="SampleInput" start="yesterday(0,0)" end="today(-1,0)" />
-    </inputs>
-
-    <outputs>
-        <output name="output" feed="SampleOutput" instance="yesterday(0,0)" />
-    </outputs>
-
-    <properties>
-        <property name="queueName" value="default" />
-        <property name="ssh.host" value="localhost" />
-        <property name="fileTimestamp" value="${coord:formatTime(coord:nominalTime(), 'yyyy-MM-dd')}" />
-    </properties>
-
-    <workflow engine="oozie" path="/examples/apps/aggregator" />
-    <retry policy="exp-backoff" delay="minutes(5)" attempts="3" />
-    
-    <late-process policy="exp-backoff" delay="hours(1)">
-        <late-input input="input" workflow-path="/projects/bootcamp/workflow/lateinput" />
-    </late-process>
-</process>
-</verbatim>
-
----+++ Result
-<verbatim>
-{
-    "requestId": "default\/e5cc8230-f356-4566-9b65-536abdff8aa3\n",
-    "message": "default\/Submit successful (process) SampleProcess\n",
-    "status": "SUCCEEDED"
-}
-</verbatim>

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/EntitySubmitAndSchedule.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/EntitySubmitAndSchedule.twiki b/trunk/releases/master/src/site/twiki/restapi/EntitySubmitAndSchedule.twiki
deleted file mode 100644
index 3cc23e9..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/EntitySubmitAndSchedule.twiki
+++ /dev/null
@@ -1,64 +0,0 @@
----++  POST /api/entities/submitAndSchedule/:entity-type
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-Submits and schedules an entity.
-
----++ Parameters
-   * :entity-type can either be a feed or a process.
-   * skipDryRun : Optional query param, Falcon skips oozie dryrun when value is set to true.
-   * doAs <optional query param> allows the current user to impersonate the user passed in doAs when interacting with the Falcon system.
-
----++ Results
-Result of the submit and schedule command.
-
----++ Examples
----+++ Rest Call
-<verbatim>
-POST http://localhost:15000/api/entities/submitAndSchedule/process?skipDryRun=false&doAs=joe
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Daily sample process. Runs at 6th hour every day. Input - last day's hourly data. Generates output for yesterday -->
-<process xmlns="uri:falcon:process:0.1" name="SampleProcess" >
-    <clusters>
-      <cluster name="primary-cluster">
-	<validity start="2012-04-03T06:00Z" end="2022-12-30T00:00Z" />
-      </cluster>
-    </clusters>
-
-    <parallel>1</parallel>
-    <order>FIFO</order>
-    <frequency>hours(1)</frequency>
-
-    <inputs>
-        <input name="input" feed="SampleInput" start="yesterday(0,0)" end="today(-1,0)" />
-    </inputs>
-
-    <outputs>
-        <output name="output" feed="SampleOutput" instance="yesterday(0,0)" />
-    </outputs>
-
-    <properties>
-        <property name="queueName" value="default" />
-        <property name="ssh.host" value="localhost" />
-        <property name="fileTimestamp" value="${coord:formatTime(coord:nominalTime(), 'yyyy-MM-dd')}" />
-    </properties>
-
-    <workflow engine="oozie" path="/examples/apps/aggregator" />
-    <retry policy="exp-backoff" delay="minutes(5)" attempts="3" />
-    
-    <late-process policy="exp-backoff" delay="hours(1)">
-        <late-input input="input" workflow-path="/projects/bootcamp/workflow/lateinput" />
-    </late-process>
-</process>
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "requestId": "schedule\/default\/b5b40931-175b-4b15-8f2b-02ef2e66f06b\n\nsubmit\/default\/b5b40931-175b-4b15-8f2b-02ef2e66f06b\n\n",
-    "message": "schedule\/default\/SampleProcess(process) scheduled successfully\n\nsubmit\/default\/Submit successful (process) SampleProcess\n\n",
-    "status": "SUCCEEDED"
-}
-</verbatim>

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/EntitySummary.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/EntitySummary.twiki b/trunk/releases/master/src/site/twiki/restapi/EntitySummary.twiki
deleted file mode 100644
index 763c2a7..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/EntitySummary.twiki
+++ /dev/null
@@ -1,74 +0,0 @@
----++  GET /api/entities/summary/:entity-type
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-Given an EntityType and cluster, get list of entities along with summary of N recent instances of each entity
-
----++ Parameters
-   * :entity-type Valid options are feed or process.
-   * cluster Show entities that belong to this cluster.
-   * start <optional param> Show entity summaries from this date. Date format is yyyy-MM-dd'T'HH:mm'Z'.
-      * By default, it is set to (end - 2 days).
-   * end <optional param> Show entity summary up to this date. Date format is yyyy-MM-dd'T'HH:mm'Z'.
-      * Default is set to now.
-   * fields <optional param> Fields of entity that the user wants to view, separated by commas.
-      * Valid options are STATUS, TAGS, PIPELINES.
-   * filterBy <optional param> Filter results by list of field:value pairs. Example: filterBy=STATUS:RUNNING,PIPELINES:clickLogs
-      * Supported filter fields are NAME, STATUS, PIPELINES, CLUSTER.
-      * Query will do an AND among filterBy fields.
-   * tags <optional param> Return list of entities that have specified tags, separated by a comma. Query will do AND on tag values.
-      * Example: tags=consumer=consumer@xyz.com,owner=producer@xyz.com
-   * orderBy <optional param> Field by which results should be ordered.
-      * Supports ordering by "name".
-   * sortOrder <optional param> Valid options are "asc" and "desc"
-   * offset <optional param> Show results from the offset, used for pagination. Defaults to 0.
-   * numResults <optional param> Number of results to show per request, used for pagination. Only integers > 0 are valid, Default is 10.
-   * numInstances <optional param> Number of recent instances to show per entity. Only integers > 0 are valid, Default is 7.
-   * doAs <optional query param> allows the current user to impersonate the user passed in doAs when interacting with the Falcon system.
-
----++ Results
-Show entities along with summary of N instances for each entity.
-
----++ Examples
----+++ Rest Call
-<verbatim>
-GET http://localhost:15000/api/entities/summary/feed?cluster=primary-cluster&filterBy=STATUS:RUNNING&fields=status&tags=consumer=consumer@xyz.com&orderBy=name&offset=0&numResults=1&numInstances=2&doAs=joe
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "entitySummary": [
-        {
-            "name"  : "SampleOutput",
-            "type"  : "feed",
-            "status": "RUNNING",
-            "instances": [
-            {
-                "details": "",
-                "endTime": "2013-10-21T14:40:26-07:00",
-                "startTime": "2013-10-21T14:39:56-07:00",
-                "cluster": "primary-cluster",
-                "logFile": "http:\/\/localhost:11000\/oozie?job=0000070-131021115933395-oozie-rgau-W",
-                "status": "RUNNING",
-                "instance": "2012-04-03T07:00Z"
-            },
-            {
-                "details": "",
-                "endTime": "2013-10-21T14:42:27-07:00",
-                "startTime": "2013-10-21T14:41:57-07:00",
-                "cluster": "primary-cluster",
-                "logFile": "http:\/\/localhost:11000\/oozie?job=0000070-131021115933397-oozie-rgau-W",
-                "status": "RUNNING",
-                "instance": "2012-04-03T08:00Z"
-            },
-            ]
-        }
-    ]
-    "requestId": "default\/e15bb378-d09f-4911-9df2-5334a45153d2\n",
-    "message": "default\/STATUS\n",
-    "status": "SUCCEEDED"
-}
-</verbatim>

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/EntitySuspend.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/EntitySuspend.twiki b/trunk/releases/master/src/site/twiki/restapi/EntitySuspend.twiki
deleted file mode 100644
index b322b27..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/EntitySuspend.twiki
+++ /dev/null
@@ -1,30 +0,0 @@
----++  POST /api/entities/suspend/:entity-type/:entity-name
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-Suspend an entity.
-
----++ Parameters
-   * :entity-type can either be a feed or a process.
-   * :entity-name is name of the entity.
-   * doAs <optional query param> allows the current user to impersonate the user passed in doAs when interacting with the Falcon system.
-
----++ Results
-Status of the entity.
-
----++ Examples
----+++ Rest Call
-<verbatim>
-POST http://localhost:15000/api/entities/suspend/process/SampleProcess?doAs=joe
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "requestId": "default\/fe5f2b6c-1f2e-49fc-af3a-342079f0b46b\n",
-    "message": "default\/SampleProcess(process) suspended successfully\n",
-    "status": "SUCCEEDED"
-}
-</verbatim>

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/EntityTouch.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/EntityTouch.twiki b/trunk/releases/master/src/site/twiki/restapi/EntityTouch.twiki
deleted file mode 100644
index 5b58ce2..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/EntityTouch.twiki
+++ /dev/null
@@ -1,31 +0,0 @@
----++ POST  api/entities/touch/:entity-type/:entity-name
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-Force updates the entity.
-
----++ Parameters
-   * :entity-type can be feed or process.
-   * :entity-name is name of the feed or process.
-   * skipDryRun : Optional query param, Falcon skips oozie dryrun when value is set to true.
-   * doAs <optional query param> allows the current user to impersonate the user passed in doAs when interacting with the Falcon system.
-
----++ Results
-Result of the validation.
-
----++ Examples
----+++ Rest Call
-<verbatim>
-POST http://localhost:15000/api/entities/touch/process/SampleProcess?skipDryRun=true&doAs=joe
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "requestId": "touch\/default\/d6aaa328-6836-4818-a212-515bb43d8b86\n\n",
-    "message": "touch\/default\/SampleProcess updated successfully\n\n",
-    "status": "SUCCEEDED"
-}
-</verbatim>

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/EntityUpdate.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/EntityUpdate.twiki b/trunk/releases/master/src/site/twiki/restapi/EntityUpdate.twiki
deleted file mode 100644
index 46b01fc..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/EntityUpdate.twiki
+++ /dev/null
@@ -1,66 +0,0 @@
----++ POST  api/entities/update/:entity-type/:entity-name
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-Updates the submitted entity.
-
----++ Parameters
-   * :entity-type can be feed or process.
-   * :entity-name is name of the feed or process.
-   * skipDryRun : Optional query param, Falcon skips oozie dryrun when value is set to true.
-   * doAs <optional query param> allows the current user to impersonate the user passed in doAs when interacting with the Falcon system.
-
----++ Results
-Result of the validation.
-
----++ Examples
----+++ Rest Call
-<verbatim>
-POST http://localhost:15000/api/entities/update/process/SampleProcess?skipDryRun=false&doAs=joe
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Daily sample process. Runs at 6th hour every day. Input - last day's hourly data. Generates output for yesterday -->
-<process xmlns="uri:falcon:process:0.1" name="SampleProcess" >
-    <clusters>
-      <cluster name="primary-cluster">
-	<validity start="2012-04-03T06:00Z" end="2022-12-30T00:00Z" />
-      </cluster>
-    </clusters>
-
-    <parallel>1</parallel>
-    <order>FIFO</order>
-    <frequency>hours(1)</frequency>
-
-    <inputs>
-        <input name="input" feed="SampleInput" start="yesterday(0,0)" end="today(-1,0)" />
-    </inputs>
-
-    <outputs>
-        <output name="output" feed="SampleOutput" instance="yesterday(0,0)" />
-    </outputs>
-
-    <properties>
-        <property name="queueName" value="default" />
-        <property name="ssh.host" value="localhost" />
-        <property name="fileTimestamp" value="${coord:formatTime(coord:nominalTime(), 'yyyy-MM-dd')}" />
-    </properties>
-
-    <workflow engine="oozie" path="/examples/apps/aggregator" />
-    <retry policy="exp-backoff" delay="minutes(5)" attempts="3" />
-    
-    <late-process policy="exp-backoff" delay="hours(1)">
-        <late-input input="input" workflow-path="/projects/bootcamp/workflow/lateinput" />
-    </late-process>
-</process>
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "requestId": "update\/default\/d6aaa328-6836-4818-a212-515bb43d8b86\n\n",
-    "message": "update\/default\/SampleProcess updated successfully\n\n",
-    "status": "SUCCEEDED"
-}
-</verbatim>
-

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/EntityValidate.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/EntityValidate.twiki b/trunk/releases/master/src/site/twiki/restapi/EntityValidate.twiki
deleted file mode 100644
index 054b083..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/EntityValidate.twiki
+++ /dev/null
@@ -1,170 +0,0 @@
----++ POST  api/entities/validate/entity-type
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-Validates the submitted entity.
-
----++ Parameters
-   * :entity-type can be cluster, feed or process.
-   * skipDryRun : Optional query param, Falcon skips oozie dryrun when value is set to true.
-   * doAs <optional query param> allows the current user to impersonate the user passed in doAs when interacting with the Falcon system.
-
----++ Results
-Result of the validation.
-
----++ Examples
----+++ Rest Call
-<verbatim>
-POST http://localhost:15000/api/entities/validate/cluster
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<cluster xmlns="uri:falcon:cluster:0.1" name="primary-cluster" description="Primary Cluster" colo="west-coast">
-    <interfaces>
-        <interface type="readonly" endpoint="hftp://localhost:50070" version="1.1.1"/>
-        <interface type="write" endpoint="hdfs://localhost:9000" version="1.1.1"/>
-        <interface type="execute" endpoint="localhost:9001" version="1.1.1"/>
-        <interface type="workflow" endpoint="http://localhost:11000/oozie/" version="4.0.0"/>
-        <interface type="messaging" endpoint="tcp://localhost:61616?daemon=true" version="5.4.3"/>
-    </interfaces>
-    <locations>
-        <location name="staging" path="/apps/falcon/staging"/>
-        <location name="temp" path="/tmp"/>
-        <location name="working" path="/apps/falcon/working"/>
-    </locations>
-</cluster>
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "requestId": "dd3f6c3a-a6f1-4c50-97fb-3f9a3f698e10",
-    "message": "Validated successfully (CLUSTER) primary-cluster",
-    "status": "SUCCEEDED"
-}
-</verbatim>
-
----+++ Rest Call
-<verbatim>
-POST http://localhost:15000/api/entities/validate/feed?skipDryRun=true
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Hourly sample input data -->
-
-<feed description="sample input data"
-      name="SampleInput" xmlns="uri:falcon:feed:0.1"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <groups>group</groups>
-    <frequency>hours(1)</frequency>
-    <late-arrival cut-off="hours(6)" />
-    <clusters>
-        <cluster name="primary-cluster" type="source">
-            <!--validity start="2009-01-01T00:00Z" end="2099-12-31T00:00Z" timezone="UTC" /-->
-            <validity start="2009-01-01T00:00Z" end="2099-12-31T00:00Z" />
-            <retention limit="months(24)" action="delete" />
-        </cluster>
-    </clusters>
-
-    <locations>
-        <location type="data" path="/projects/bootcamp/data/${YEAR}-${MONTH}-${DAY}-${HOUR}/SampleInput" />
-        <location type="stats" path="/projects/bootcamp/stats/SampleInput" />
-        <location type="meta" path="/projects/bootcamp/meta/SampleInput" />
-    </locations>
-
-    <ACL owner="suser" group="users" permission="0755" />
-
-    <schema location="/none" provider="none" />
-</feed>
-</verbatim>
-
----+++ Result
-<verbatim>
-{
-    "requestId": "c85b190e-e653-493a-a863-d62de9c2e3b0",
-    "message": "Validated successfully (FEED) SampleInput",
-    "status": "SUCCEEDED"
-}
-</verbatim>
-
----+++ Rest Call
-<verbatim>
-POST http://localhost:15000/api/entities/validate/feed
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Daily sample output data -->
-
-<feed description="sample output data" name="SampleOutput" xmlns="uri:falcon:feed:0.1"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <groups>group</groups>
-    <frequency>hours(1)</frequency>
-    <late-arrival cut-off="hours(6)" />
-    <clusters>
-        <cluster name="primary-cluster" type="source">
-            <!--validity start="2009-01-01T00:00Z" end="2099-12-31T00:00Z" timezone="UTC" /-->
-            <validity start="2009-01-01T00:00Z" end="2099-12-31T00:00Z" />
-            <retention limit="months(24)" action="delete" />
-        </cluster>
-    </clusters>
-    <locations>
-        <location type="data" path="/projects/bootcamp/output/${YEAR}-${MONTH}-${DAY}-${HOUR}/SampleOutput" />
-        <location type="stats" path="/projects/bootcamp/stats/SampleOutput" />
-        <location type="meta" path="/projects/bootcamp/meta/SampleOutput" />
-    </locations>
-    <ACL owner="suser" group="users" permission="0755" />
-    <schema location="/none" provider="none" />
-</feed>
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "requestId": "60781732-460e-4c6c-ba86-a75fae574b05",
-    "message": "Validated successfully (FEED) SampleOutput",
-    "status": "SUCCEEDED"
-}
-</verbatim>
-
----+++ Rest Call
-<verbatim>
-POST http://localhost:15000/api/entities/validate/process?skipDryRun=false&doAs=joe
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Daily sample process. Runs at 6th hour every day. Input - last day's hourly data. Generates output for yesterday -->
-<process xmlns="uri:falcon:process:0.1" name="SampleProcess" >
-    <clusters>
-      <cluster name="primary-cluster">
-	<validity start="2012-04-03T06:00Z" end="2022-12-30T00:00Z" />
-      </cluster>
-    </clusters>
-
-    <parallel>1</parallel>
-    <order>FIFO</order>
-    <frequency>hours(1)</frequency>
-
-    <inputs>
-        <input name="input" feed="SampleInput" start="yesterday(0,0)" end="today(-1,0)" />
-    </inputs>
-
-    <outputs>
-        <output name="output" feed="SampleOutput" instance="yesterday(0,0)" />
-    </outputs>
-
-    <properties>
-        <property name="queueName" value="default" />
-        <property name="ssh.host" value="localhost" />
-        <property name="fileTimestamp" value="${coord:formatTime(coord:nominalTime(), 'yyyy-MM-dd')}" />
-    </properties>
-
-    <workflow engine="oozie" path="/examples/apps/aggregator" />
-    <retry policy="exp-backoff" delay="minutes(5)" attempts="3" />
-    
-    <late-process policy="exp-backoff" delay="hours(1)">
-        <late-input input="input" workflow-path="/projects/bootcamp/workflow/lateinput" />
-    </late-process>
-</process>
-</verbatim>
-
----+++ Result
-<verbatim>
-{
-    "requestId": "e4a965c6-c7a2-41d9-ba08-2e77f1c43f57",
-    "message": "Validated successfully (PROCESS) SampleProcess",
-    "status": "SUCCEEDED"
-}
-</verbatim>

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/FeedInstanceListing.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/FeedInstanceListing.twiki b/trunk/releases/master/src/site/twiki/restapi/FeedInstanceListing.twiki
deleted file mode 100644
index 03f3c57..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/FeedInstanceListing.twiki
+++ /dev/null
@@ -1,46 +0,0 @@
----++ GET /api/instance/listing/feed/:entity-name
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-Get falcon feed instance availability.
-
----++ Parameters
-   * :entity-name Name of the entity.
-   * start <optional param> Show instances from this date. Date format is yyyy-MM-dd'T'HH:mm'Z'.
-      * By default, it is set to (end - (10 * entityFrequency)).
-   * end <optional param> Show instances up to this date. Date format is yyyy-MM-dd'T'HH:mm'Z'.
-      * Default is set to now.
-   * colo <optional param> Colo on which the query should be run.
-   * doAs <optional query param> allows the current user to impersonate the user passed in doAs when interacting with the Falcon system.
-
----++ Results
-Feed instance availability status
-
----++ Examples
----+++ Rest Call
-<verbatim>
-GET http://localhost:15000/api/instance/listing/feed/SampleFeed?colo=*&start=2012-04-03T07:00Z&doAs=joe
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "instances": [
-        {
-            "size": "450231212222",
-            "creationTime": "1236679827365",
-            "cluster": "primary-cluster",
-            "uri": "/data/SampleFeed/2012-04-03",
-            "status": "AVAILABLE",
-            "instance": "2012-04-03T07:00Z"
-        }
-    ],
-    "requestId": "default\/3527038e-8334-4e50-8173-76c4fa430d0b\n",
-    "message": "default\/STATUS\n",
-    "status": "SUCCEEDED"
-}
-</verbatim>
-
-

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/FeedLookup.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/FeedLookup.twiki b/trunk/releases/master/src/site/twiki/restapi/FeedLookup.twiki
deleted file mode 100644
index 053182b..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/FeedLookup.twiki
+++ /dev/null
@@ -1,37 +0,0 @@
----++  GET api/entities/lookup/feed
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-
----++ Parameters
-    * path path of the instance for which you want to determine the feed. e.g. /data/project1/2014/10/10/23/
-    Path has to be the complete path and can't be a part of it.
-    * doAs <optional query param> allows the current user to impersonate the user passed in doAs when interacting with the Falcon system.
-
----++ Results
-Returns the name of the feed along with the location type(meta/data/stats) and cluster on which the given path belongs to this feed.
-
----++ Examples
----+++ Rest Call
-<verbatim>
-GET http://localhost:15000/api/entities/lookup/feed?path=/data/project1/2014/10/10/23&doAs=joe
-</verbatim>
----+++ Result
-{
-    "feeds":
-    [
-        {
-           "feedName": "My-Feed1",
-           "locationType": "DATA",
-           "clusterName": "My-cluster1"
-        },
-        {
-           "feedName": "My-Feed2",
-           "locationType": "DATA",
-           "clusterName": "My-cluster2"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/FeedSLA.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/FeedSLA.twiki b/trunk/releases/master/src/site/twiki/restapi/FeedSLA.twiki
deleted file mode 100644
index 8760976..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/FeedSLA.twiki
+++ /dev/null
@@ -1,56 +0,0 @@
----++ GET /api/entities/sla-alert/:entity-type
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-<verbatim>
-Since: 0.8
-</verbatim>
-This command lists all the feed instances which have missed sla and are still not available. If a feed instance missed
-sla but is now available, then it will not be reported in results. The purpose of this API is alerting and hence it
- doesn't return feed instances which missed SLA but are available as they don't require any action.
-
----++ Parameters
-   * :entity-type Only valid option is feed.
-   * entity-name <optional param> parameter to restrict results for a particular feed using feed's name.
-   * start <mandatory param> start of the time window for nominal instances, inclusive.
-   * end <mandatory param> end of the time window for nominal instances to be considered, default is treated as current time.
-   * colo <optional param> name of the colo
-
-
----++ Results
-Pending feed instances which missed SLA.
-
----++ Examples
----+++ Rest Call
-<verbatim>
-GET http://localhost:15000/api/entities/sla-alert/feed?colo=*&start=2012-04-03T07:00Z
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "status":"SUCCEEDED",
-    "message":"default/Success!\n",
-    "requestId":"default/885720178@qtp-495452957-6 - f6e82e9b-d23f-466b-82df-4fb8293ce9cf\n",
-    "instances":[
-            {"cluster":"local","entityName":"out","entityType":"FEED","instanceTime":"2015-09-26T17:33:00+05:30","tags":"Missed SLA High"},
-            {"cluster":"local","entityName":"out","entityType":"FEED","instanceTime":"2015-09-26T17:29:00+05:30","tags":"Missed SLA High"},
-            {"cluster":"local","entityName":"out","entityType":"FEED","instanceTime":"2015-09-26T17:35:00+05:30","tags":"Missed SLA Low"},
-            {"cluster":"local","entityName":"out","entityType":"FEED","instanceTime":"2015-09-26T17:30:00+05:30","tags":"Missed SLA High"},
-            {"cluster":"local","entityName":"out","entityType":"FEED","instanceTime":"2015-09-26T17:34:00+05:30","tags":"Missed SLA High"},
-            {"cluster":"local","entityName":"out","entityType":"FEED","instanceTime":"2015-09-26T17:31:00+05:30","tags":"Missed SLA High"},
-            {"cluster":"local","entityName":"out","entityType":"FEED","instanceTime":"2015-09-26T17:32:00+05:30","tags":"Missed SLA High"}
-    ]
-}
-</verbatim>
-
-In case there are no pending instances which have missed sla the response will be like below:
-<verbatim>
-{
-    "status":"SUCCEEDED",
-    "message":"default/Success!\n",
-    "requestId":"default/979808239@qtp-1243851750-3 - 8c7396c0-efe2-43e9-9aea-7ae6afea5fd6\n"
-}
-</verbatim>

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/Graph.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/Graph.twiki b/trunk/releases/master/src/site/twiki/restapi/Graph.twiki
deleted file mode 100644
index db58d2e..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/Graph.twiki
+++ /dev/null
@@ -1,22 +0,0 @@
----++  GET api/metadata/lineage/serialize
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-Dump the graph.
-
----++ Parameters
-   * doAs <optional query param> allows the current user to impersonate the user passed in doAs when interacting with the Falcon system.
-
----++ Results
-Serialize graph to a file configured using *.falcon.graph.serialize.path in Custom startup.properties.
-
----++ Examples
----+++ Rest Call
-<verbatim>
-GET http://localhost:15000/api/metadata/lineage/serialize?doAs=joe
-</verbatim>
----+++ Result
-None.

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/InstanceDependencies.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/InstanceDependencies.twiki b/trunk/releases/master/src/site/twiki/restapi/InstanceDependencies.twiki
deleted file mode 100644
index 5641757..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/InstanceDependencies.twiki
+++ /dev/null
@@ -1,49 +0,0 @@
----++ GET /api/instance/dependencies/:entity-type/:entity-name
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-Get dependent instances for a particular instance.
-
----++ Parameters
-   * :entity-type Valid options are feed or process.
-   * :entity-name Name of the entity
-   * instanceTime <mandatory param> time of the given instance
-   * colo <optional param> name of the colo
-
-
----++ Results
-Dependent instances for the specified instance
-
----++ Examples
----+++ Rest Call
-<verbatim>
-GET http://localhost:15000/api/instance/dependencies/feed/myFeed?colo=*&instanceTime=2012-04-03T07:00Z
-</verbatim>
----+++ Result
-<verbatim>
-{
-    'status': 'SUCCEEDED',
-    'message': 'default/Success!\n',
-    'dependencies': [
-        {
-            'cluster': 'local',
-            'entityName': 'consumer-process',
-            'entityType': 'PROCESS',
-            'instanceTime': '2014-12-18T00:00Z',
-            'tags': 'Input'
-        },
-        {
-            'cluster': 'local',
-            'entityName': 'producer-process',
-            'entityType': 'PROCESS',
-            'instanceTime': '2014-12-18T00:00Z',
-            'tags': 'Output'
-        }
-    ],
-    'requestId': 'default/1405883107@qtp-1501726962-6-0c2e690f-546b-47b0-a5ee-0365d4522a31\n'
-}
-</verbatim>
-

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/InstanceKill.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/InstanceKill.twiki b/trunk/releases/master/src/site/twiki/restapi/InstanceKill.twiki
deleted file mode 100644
index eb22945..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/InstanceKill.twiki
+++ /dev/null
@@ -1,44 +0,0 @@
----++  POST /api/instance/kill/:entity-type/:entity-name
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-Kill currently running instance(s) of an entity.
-
----++ Parameters
-   * :entity-type can either be a feed or a process.
-   * :entity-name is name of the entity.
-   * start is the start time of the instance(s) that you want to refer to
-   * end is the end time of the instance(s) that you want to refer to
-   * lifecycle <optional param> can be Eviction/Replication(default) for feed and Execution(default) for process.
-   * doAs <optional query param> allows the current user to impersonate the user passed in doAs when interacting with the Falcon system.
-
----++ Results
-Result of the kill operation.
-
----++ Examples
----+++ Rest Call
-<verbatim>
-POST http://localhost:15000/api/instance/kill/process/SampleProcess?colo=*&start=2012-04-03T07:00Z&end=2014-04-03T07:00Z&doAs=joe
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "instances": [
-        {
-            "details": "",
-            "endTime": "2013-10-21T15:26:59-07:00",
-            "startTime": "2013-10-21T15:19:57-07:00",
-            "cluster": "primary-cluster",
-            "logFile": "http:\/\/localhost:11000\/oozie?job=0000070-131021115933395-oozie-rgau-W",
-            "status": "KILLED",
-            "instance": "2012-04-03T07:00Z"
-        }
-    ],
-    "requestId": "default\/23b3cfee-ee22-40c0-825d-39c322587d5f\n",
-    "message": "default\/KILL\n",
-    "status": "SUCCEEDED"
-}
-</verbatim>

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/InstanceList.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/InstanceList.twiki b/trunk/releases/master/src/site/twiki/restapi/InstanceList.twiki
deleted file mode 100644
index 214c22f..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/InstanceList.twiki
+++ /dev/null
@@ -1,151 +0,0 @@
----++  GET /api/instance/list/:entity-type/:entity-name
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-Get list of all instances of a given entity.
-
----++ Parameters
-   * :entity-type Valid options are cluster, feed or process.
-   * :entity-name Name of the entity.
-   * start <optional param> Show instances from this date. Date format is yyyy-MM-dd'T'HH:mm'Z'.
-      * By default, it is set to (end - (10 * entityFrequency)).
-   * end <optional param> Show instances up to this date. Date format is yyyy-MM-dd'T'HH:mm'Z'.
-      * Default is set to now.
-   * colo <optional param> Colo on which the query should be run.
-   * lifecycle <optional param> Valid lifecycles for feed are Eviction/Replication(default) and for process is Execution(default).
-   * filterBy <optional param>  Filter results by list of field:value pairs. Example: filterBy=STATUS:RUNNING,CLUSTER:primary-cluster
-      * Supported filter fields are STATUS, CLUSTER, SOURCECLUSTER, STARTEDAFTER.
-      * Query will do an AND among filterBy fields.
-   * orderBy <optional param> Field by which results should be ordered.
-      * Supports ordering by  "status","startTime","endTime","cluster".
-   * sortOrder <optional param> Valid options are "asc" and "desc"
-   * offset <optional param> Show results from the offset, used for pagination. Defaults to 0.
-   * numResults <optional param> Number of results to show per request, used for pagination. Only integers > 0 are valid, Default is 10.
-   * doAs <optional query param> allows the current user to impersonate the user passed in doAs when interacting with the Falcon system.
-   * allAttempts <optional query param> To get all the attempts for corresponding instances.
-   
----++ Results
-List of instances of given entity.
-
-The possible instance status returned and its meaning are as follows:
-   * WAITING - The instance is waiting for the corresponding data(feed) instances to become available.
-   * READY - The instance is ready to be scheduled. But, is waiting for scheduling conditions to be met. For example, limitation on number of instances that can be run in parallel.
-   * RUNNING - The instance is running on the workflow engine.
-   * FAILED - The instance has failed during execution.
-   * KILLED - The instance has been killed either manually or by the system.
-   * SUCCEEDED - The instance has executed successfully.
-   * SKIPPED - This instance was not executed, but was skipped. For example, when the execution order is LAST_ONLY, the older instances are skipped.
-   * ERROR - There was error while executing this instance on the workflow engine.
-   * UNDEFINED - The status of the instance could not be determined.
----++ Examples
----+++ Rest Call
-<verbatim>
-GET http://localhost:15000/api/instance/list/process/SampleProcess?colo=*&start=2012-04-03T07:00Z
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "instances": [
-        {
-            "details": "",
-            "endTime": "2013-10-21T14:40:26-07:00",
-            "startTime": "2013-10-21T14:39:56-07:00",
-            "cluster": "primary-cluster",
-            "logFile": "http:\/\/localhost:11000\/oozie?job=0000070-131021115933395-oozie-rgau-W",
-            "status": "SUCCEEDED",
-            "instance": "2012-04-03T07:00Z"
-        }
-    ],
-    "requestId": "default\/e15bb378-d09f-4911-9df2-5334a45153d2\n",
-    "message": "default\/STATUS\n",
-    "status": "SUCCEEDED"
-}
-</verbatim>
-
-
----+++ Rest Call
-<verbatim>
-GET http://localhost:15000/api/instance/list/process/SampleProcess?colo=*&start=2012-04-03T07:00Z&filterBy=STATUS:SUCCEEDED,CLUSTER:primary-cluster&orderBy=startTime&offset=2&numResults=2&doAs=joe
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "instances": [
-        {
-            "details": "",
-            "endTime": "2013-10-21T14:40:26-07:00",
-            "startTime": "2013-10-21T14:39:56-07:00",
-            "cluster": "primary-cluster",
-            "logFile": "http:\/\/localhost:11000\/oozie?job=0000070-131021115933395-oozie-rgau-W",
-            "status": "SUCCEEDED",
-            "instance": "2012-04-03T07:00Z"
-        },
-        {
-            "details": "",
-            "endTime": "2013-10-21T14:42:26-07:00",
-            "startTime": "2013-10-21T14:41:56-07:00",
-            "cluster": "primary-cluster",
-            "logFile": "http:\/\/localhost:11000\/oozie?job=0000070-131021115933397-oozie-rgau-W",
-            "status": "SUCCEEDED",
-            "instance": "2012-04-03T08:00Z"
-        },
-    ],
-
-    "requestId": "default\/e15bb378-d09f-4911-9df2-5334a45153d2\n",
-    "message": "default\/STATUS\n",
-    "status": "SUCCEEDED"
-}
-</verbatim>
-
-
----+++ Rest Call
-<verbatim>
-GET https://localhost:15443/api/instance/status/process/oozie-mr-process?user.name=narayan&start=2013-11-15T00:05Z&end=2013-11-15T01:00Z&colo=*&offset=0&allAttempts=true
-</verbatim>
----+++ Result
-<verbatim>
-{
-   "status":"SUCCEEDED",
-   "message":"default/STATUS\n",
-   "requestId":"default/942519651@qtp-1386909980-16 - 5b11a8ba-402b-4cc7-969c-256e0ed18ae2\n",
-   "instances":[
-      {
-         "instance":"2013-11-15T00:05Z",
-         "status":"SUCCEEDED",
-         "logFile":"http://IM1948-X0:11000/oozie?job=0000010-160106121750678-oozie-oozi-W",
-         "cluster":"local",
-         "startTime":"2016-01-06T12:39:22+05:30",
-         "endTime":"2016-01-06T12:40:05+05:30",
-         "runId":0,
-         "details":"",
-         "actions":[
-            {
-               "action":"mr-node",
-               "status":"SUCCEEDED",
-               "logFile":"http://localhost:8088/proxy/application_1452062826344_0010/"
-            }
-         ]
-      },
-      {
-         "instance":"2013-11-15T00:05Z",
-         "status":"SUCCEEDED",
-         "logFile":"http://IM1948-X0:11000/oozie?job=0000011-160106121750678-oozie-oozi-W",
-         "cluster":"local",
-         "startTime":"2016-01-06T12:40:27+05:30",
-         "endTime":"2016-01-06T12:41:05+05:30",
-         "runId":0,
-         "details":"",
-         "actions":[
-            {
-               "action":"mr-node",
-               "status":"SUCCEEDED",
-               "logFile":"http://localhost:8088/proxy/application_1452062826344_0012/"
-            }
-         ]
-      }
-   ]
-}
-</verbatim>

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/InstanceLogs.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/InstanceLogs.twiki b/trunk/releases/master/src/site/twiki/restapi/InstanceLogs.twiki
deleted file mode 100644
index 1e1c98d..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/InstanceLogs.twiki
+++ /dev/null
@@ -1,113 +0,0 @@
----++ GET /api/instance/logs/:entity-type/:entity-name
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-Get log of a specific instance of an entity.
-
----++ Parameters
-   * :entity-type Valid options are cluster, feed or process.
-   * :entity-name Name of the entity.
-   * start <optional param> Show instances from this date. Date format is yyyy-MM-dd'T'HH:mm'Z'.
-      * By default, it is set to (end - (10 * entityFrequency)).
-   * end <optional param> Show instances up to this date. Date format is yyyy-MM-dd'T'HH:mm'Z'.
-      * Default is set to now.
-   * colo <optional param> Colo on which the query should be run.
-   * runId <optional param> Run Id.
-   * lifecycle <optional param> Valid lifecycles for feed are Eviction/Replication(default) and for process is Execution(default).
-   * filterBy <optional param>  Filter results by list of field:value pairs. Example: filterBy=STATUS:RUNNING,CLUSTER:primary-cluster
-      * Supported filter fields are STATUS, CLUSTER, SOURCECLUSTER, STARTEDAFTER.
-      * Query will do an AND among filterBy fields.
-   * orderBy <optional param> Field by which results should be ordered.
-      * Supports ordering by "status","startTime","endTime","cluster".
-   * sortOrder <optional param> Valid options are "asc" and "desc"
-   * offset <optional param> Show results from the offset, used for pagination. Defaults to 0.
-   * numResults <optional param> Number of results to show per request, used for pagination. Only integers > 0 are valid, Default is 10.
-   * doAs <optional query param> allows the current user to impersonate the user passed in doAs when interacting with the Falcon system.
-
----++ Results
-Log of specified instance.
-
----++ Examples
----+++ Rest Call
-<verbatim>
-GET http://localhost:15000/api/instance/logs/process/SampleProcess?colo=*&start=2012-04-03T07:00Z
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "instances": [
-        {
-            "actions": [
-                {
-                    "logFile": "http:\/\/localhost:50070\/data\/apps\/falcon\/staging\/falcon\/workflows\/process\/SampleProcess\/logs\/job-2012-04-03-07-00\/000\/pig_SUCCEEDED.log",
-                    "status": "SUCCEEDED",
-                    "action": "pig"
-                }
-            ],
-            "details": "",
-            "endTime": "2013-10-21T14:40:26-07:00",
-            "startTime": "2013-10-21T14:39:56-07:00",
-            "cluster": "primary-cluster",
-            "logFile": "http:\/\/localhost:50070\/data\/apps\/falcon\/staging\/falcon\/workflows\/process\/SampleProcess\/logs\/job-2012-04-03-07-00\/000\/oozie.log",
-            "status": "SUCCEEDED",
-            "instance": "2012-04-03T07:00Z"
-        }
-    ],
-    "requestId": "default\/3527038e-8334-4e50-8173-76c4fa430d0b\n",
-    "message": "default\/STATUS\n",
-    "status": "SUCCEEDED"
-}
-</verbatim>
-
----+++ Rest Call
-<verbatim>
-GET http://localhost:15000/api/instance/logs/process/SampleProcess?colo=*&start=2012-04-03T07:00Z&filterBy=STATUS:SUCCEEDED,CLUSTER:primary-cluster&orderBy=startTime&offset=2&numResults=2&doAs=joe
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "instances": [
-        {
-            "actions": [
-                {
-                    "logFile": "http:\/\/localhost:50070\/data\/apps\/falcon\/staging\/falcon\/workflows\/process\/SampleProcess\/logs\/job-2012-04-03-07-00\/000\/pig_SUCCEEDED.log",
-                    "status": "SUCCEEDED",
-                    "action": "pig"
-                }
-            ],
-            "details": "",
-            "endTime": "2013-10-21T14:40:26-07:00",
-            "startTime": "2013-10-21T14:39:56-07:00",
-            "cluster": "primary-cluster",
-            "logFile": "http:\/\/localhost:50070\/data\/apps\/falcon\/staging\/falcon\/workflows\/process\/SampleProcess\/logs\/job-2012-04-03-07-00\/000\/oozie.log",
-            "status": "SUCCEEDED",
-            "instance": "2012-04-03T07:00Z"
-        },
-        {
-            "actions": [
-                {
-                    "logFile": "http:\/\/localhost:50070\/data\/apps\/falcon\/staging\/falcon\/workflows\/process\/SampleProcess\/logs\/job-2012-04-03-07-00\/001\/pig_SUCCEEDED.log",
-                    "status": "SUCCEEDED",
-                    "action": "pig"
-                }
-            ],
-            "details": "",
-            "endTime": "2013-10-21T14:42:27-07:00",
-            "startTime": "2013-10-21T14:41:57-07:00",
-            "cluster": "primary-cluster",
-            "logFile": "http:\/\/localhost:50070\/data\/apps\/falcon\/staging\/falcon\/workflows\/process\/SampleProcess\/logs\/job-2012-04-03-07-00\/001\/oozie.log",
-            "status": "SUCCEEDED",
-            "instance": "2012-04-03T08:00Z"
-        }
-    ],
-    "requestId": "default\/3527038e-8334-4e50-8173-76c4fa430d0b\n",
-    "message": "default\/STATUS\n",
-    "status": "SUCCEEDED"
-}
-</verbatim>
-
-
-

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/InstanceParams.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/InstanceParams.twiki b/trunk/releases/master/src/site/twiki/restapi/InstanceParams.twiki
deleted file mode 100644
index 7a340a5..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/InstanceParams.twiki
+++ /dev/null
@@ -1,83 +0,0 @@
----++  GET /api/instance/params/:entity-type/:entity-name
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-Get the params passed to the workflow for an instance of feed/process.
-
----++ Parameters
-   * :entity-type Valid options are cluster, feed or process.
-   * :entity-name Name of the entity.
-   * start should be the nominal time of the instance for which you want the params to be returned
-   * colo <optional param> Colo on which the query should be run.
-   * lifecycle <optional param> Valid lifecycles for feed are Eviction/Replication(default) and for process is Execution(default).
-   * doAs <optional query param> allows the current user to impersonate the user passed in doAs when interacting with the Falcon system.
-
-
----++ Results
-List of instances currently running.
-
----++ Examples
----+++ Rest Call
-<verbatim>
-http://userqa.user.com:16000/api/instance/params/process/Sample-Process?start=2014-10-01T11:00Z&colo=*&doAs=joe
-</verbatim>
----+++ Result
-{
-    "status": "SUCCEEDED",
-    "message": "ua1/PARAMS\n",
-    "requestId": "ua1/807e9fe6-ba60-490e-b720-f8dc8b92063e\n",
-    "instances": [
-        {
-            "instance": "2014-10-01T11:00Z",
-            "status": "RUNNING",
-            "logFile": "http://spyke.user.com:11000/oozie?job=0000211-141117203201940-oozie-oozi-W",
-            "cluster": "sample-cluster",
-            "startTime": "2014-11-19T19:46:29+08:00",
-            "details": "",
-            "actions": [
-                {
-                    "action": "succeeded-post-processing",
-                    "status": "RUNNING",
-                    "logFile": "http://spyke.user.com:50030/jobdetails.jsp?jobid=job_201411071450_1052"
-                }
-            ],
-            "params": {
-                "entry": {"key": "jobTracker", "value": "10.16.114.113:8021"},
-                "entry":{"key":"falconInputNames","value":"IGNORE"},
-                "entry":{"key":"shouldRecord","value":"false"},
-                "entry":{"key":"timeStamp","value":"2014-11-19-11-46"},
-                "entry":{"key":"falconInPaths","value":"IGNORE"},
-                "entry":{"key":"broker.url","value":"tcp://localhost:61616"},
-                "entry":{"key":"feedNames","value":"NONE"},
-                "entry":{"key":"falcon.libpath","value":"/path/falcon/sample/lib"},
-                "entry":{"key":"ENTITY_PATH","value":"/path/falcon/staging/falcon/workflows/process/Sample-Process/9506be19980e0e6fdb709e1baffff_1416397585511/DEFAULT"},
-                "entry":{"key":"entityType","value":"process"},
-                "entry":{"key":"nominalTime","value":"2014-10-01-11-00"},
-                "entry":{"key":"feedInstancePaths","value":"IGNORE"},
-                "entry":{"key":"oozie.bundle.application.path","value":"hdfs://10.16.104.13:8020/path/falcon/staging/falcon/workflows/process/Sample-Process/9506be19980e0e669709e1baffff_1416397585511"},
-                "entry":{"key":"logDir","value":"hdfs://10.16.104.13:8020/path/falcon/staging/falcon/workflows/process/Sample-Process/logs"},
-                "entry":{"key":"userWorkflowEngine","value":"oozie"},
-                "entry":{"key":"broker.ttlInMins","value":"4320"},
-                "entry":{"key":"oozie.use.system.libpath","value":"true"},
-                "entry":{"key":"queueName","value":"reports"},
-                "entry":{"key":"falconDataOperation","value":"GENERATE"},
-                "entry":{"key":"oozie.wf.external.id","value":"Sample-Process/DEFAULT/2014-10-01T11:00Z"},
-                "entry":{"key":"workflowEngineUrl","value":"http://10.11.100.10:11000/oozie/"},
-                "entry":{"key":"userBrokerImplClass","value":"org.apache.activemq.ActiveMQConnectionFactory"},
-                "entry":{"key":"ENTITY_NAME","value":"FALCON_PROCESS_DEFAULT_Sample-Process"},
-                "entry":{"key":"broker.impl.class","value":"org.apache.activemq.ActiveMQConnectionFactory"},
-                "entry":{"key":"userWorkflowName","value":"Sample-workflow"},
-                "entry":{"key":"entityName","value":"Sample-Process"},
-                "entry":{"key":"srcClusterName","value":"NA"},
-                "entry":{"key":"userBrokerUrl","value":"tcp://localhost:61616?daemon=true"},
-                "entry":{"key":"falconInputFeeds","value":"NONE"},
-                "entry":{"key":"user.name","value":"sampleuser"},
-                "entry":{"key":"threedaysback","value":"2014-09-28"},
-                "entry":{"key":"userWorkflowVersion","value":"1.0"}
-            }
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/InstanceRerun.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/InstanceRerun.twiki b/trunk/releases/master/src/site/twiki/restapi/InstanceRerun.twiki
deleted file mode 100644
index eef0e1a..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/InstanceRerun.twiki
+++ /dev/null
@@ -1,66 +0,0 @@
----++  POST /api/instance/rerun/:entity-type/:entity-name
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-Rerun instances of an entity. On issuing a rerun, by default the execution resumes from the last failed node in the workflow.
-
----++ Parameters
-   * :entity-type can either be a feed or a process.
-   * :entity-name is name of the entity.
-   * start is the start time of the instance that you want to refer to
-   * end is the end time of the instance that you want to refer to
-   * lifecycle <optional param> can be Eviction/Replication(default) for feed and Execution(default) for process.
-   * force <optional param> can be used to forcefully rerun the entire instance.
-   * doAs <optional query param> allows the current user to impersonate the user passed in doAs when interacting with the Falcon system.
-
----++ Results
-Results of the rerun command.
-
----++ Examples
----+++ Rest Call
-<verbatim>
-POST http://localhost:15000/api/instance/rerun/process/SampleProcess?colo=*&start=2013-04-03T07:00Z&end=2014-04-03T07:00Z
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "instances": [
-        {
-            "details": "",
-            "startTime": "2013-10-21T15:10:47-07:00",
-            "cluster": "primary-cluster",
-            "logFile": "http:\/\/localhost:11000\/oozie?job=0000070-131021115933395-oozie-rgau-W",
-            "status": "RUNNING",
-            "instance": "2012-04-03T07:00Z"
-        }
-    ],
-    "requestId": "default\/7a3582bd-608c-45a7-9b74-1837b51ba6d5\n",
-    "message": "default\/RERUN\n",
-    "status": "SUCCEEDED"
-}
-</verbatim>
-
-<verbatim>
-POST http://localhost:15000/api/instance/rerun/process/SampleProcess?colo=*&start=2013-04-03T07:00Z&end=2014-04-03T07:00Z&force=true&doAs=joe
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "instances": [
-        {
-            "details": "",
-            "startTime": "2013-10-21T15:10:47-07:00",
-            "cluster": "primary-cluster",
-            "logFile": "http:\/\/localhost:11000\/oozie?job=0000070-131021115933395-oozie-rgau-W",
-            "status": "RUNNING",
-            "instance": "2012-04-03T07:00Z"
-        }
-    ],
-    "requestId": "default\/7a3582bd-608c-45a7-9b74-1837b51ba6d5\n",
-    "message": "default\/RERUN\n",
-    "status": "SUCCEEDED"
-}
-</verbatim>

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/InstanceResume.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/InstanceResume.twiki b/trunk/releases/master/src/site/twiki/restapi/InstanceResume.twiki
deleted file mode 100644
index 1254785..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/InstanceResume.twiki
+++ /dev/null
@@ -1,43 +0,0 @@
----++  POST /api/instance/resume/:entity-type/:entity-name
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-Resume suspended instances of an entity.
-
----++ Parameters
-   * :entity-type can either be a feed or a process.
-   * :entity-name is name of the entity.
-   * start is the start time of the instance(s) that you want to refer to
-   * end is the end time of the instance(s) that you want to refer to
-   * lifecycle <optional param> can be Eviction/Replication(default) for feed and Execution(default) for process.
-   * doAs <optional query param> allows the current user to impersonate the user passed in doAs when interacting with the Falcon system.
-
----++ Results
-Results of the resume command.
-
----++ Examples
----+++ Rest Call
-           <verbatim>
-           POST http://localhost:15000/api/instance/resume/process/SampleProcess?colo=*&start=2012-04-03T07:00Z&end=2014-04-03T07:00Z&doAs=joe
-           </verbatim>
-           ---+++ Result
-           <verbatim>
-           {
-               "instances": [
-                   {
-                       "details": "",
-                       "startTime": "2013-10-21T15:19:57-07:00",
-                       "cluster": "primary-cluster",
-                       "logFile": "http:\/\/localhost:11000\/oozie?job=0000070-131021115933395-oozie-rgau-W",
-                       "status": "RUNNING",
-                       "instance": "2012-04-03T07:00Z"
-                   }
-               ],
-               "requestId": "default\/e88ff2e0-2af7-4829-a360-f92e95be2981\n",
-               "message": "default\/RESUME\n",
-               "status": "SUCCEEDED"
-           }
-           </verbatim>

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/InstanceRunning.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/InstanceRunning.twiki b/trunk/releases/master/src/site/twiki/restapi/InstanceRunning.twiki
deleted file mode 100644
index 3d1cabc..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/InstanceRunning.twiki
+++ /dev/null
@@ -1,84 +0,0 @@
----++  GET /api/instance/running/:entity-type/:entity-name
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-Get a list of instances currently running for a given entity.
-
----++ Parameters
-   * :entity-type Valid options are cluster, feed or process.
-   * :entity-name Name of the entity.
-   * colo <optional param> Colo on which the query should be run.
-   * lifecycle <optional param> Valid lifecycles for feed are Eviction/Replication(default) and for process is Execution(default).
-   * filterBy <optional param>  Filter results by list of field:value pairs. Example: filterBy=CLUSTER:primary-cluster
-      * Supported filter fields are CLUSTER, SOURCECLUSTER, STARTEDAFTER.
-      * Query will do an AND among filterBy fields.
-   * orderBy <optional param> Field by which results should be ordered.
-      * Supports ordering by "status","startTime","endTime","cluster".
-   * sortOrder <optional param> Valid options are "asc" and "desc"
-   * offset <optional param> Show results from the offset, used for pagination. Defaults to 0.
-   * numResults <optional param> Number of results to show per request, used for pagination. Only integers > 0 are valid, Default is 10.
-   * doAs <optional query param> allows the current user to impersonate the user passed in doAs when interacting with the Falcon system.
-
----++ Results
-List of instances currently running.
-
----++ Examples
----+++ Rest Call
-<verbatim>
-GET http://localhost:15000/api/instance/running/process/SampleProcess?colo=*
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "instances": [
-        {
-            "startTime": "2013-10-21T14:39:28-07:00",
-            "cluster": "primary-cluster",
-            "status": "RUNNING",
-            "instance": "2012-04-03T06:00Z"
-        }
-    ],
-    "requestId": "default\/12e9a7d4-3b4f-4a76-b471-c8f3786a62a0\n",
-    "message": "default\/Running Instances\n",
-    "status": "SUCCEEDED"
-}
-</verbatim>
-
-
----+++ Rest Call
-<verbatim>
-GET http://localhost:15000/api/instance/running/process/SampleProcess?colo=*&start=2012-04-03T07:00Z&filterBy=CLUSTER:primary-cluster&orderBy=startTime&offset=2&numResults=2&doAs=joe
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "instances": [
-        {
-            "details": "",
-            "endTime": "2013-10-21T14:40:26-07:00",
-            "startTime": "2013-10-21T14:39:56-07:00",
-            "cluster": "primary-cluster",
-            "logFile": "http:\/\/localhost:11000\/oozie?job=0000070-131021115933395-oozie-rgau-W",
-            "status": "RUNNING",
-            "instance": "2012-04-03T07:00Z"
-        },
-        {
-            "details": "",
-            "endTime": "2013-10-21T14:42:27-07:00",
-            "startTime": "2013-10-21T14:41:57-07:00",
-            "cluster": "primary-cluster",
-            "logFile": "http:\/\/localhost:11000\/oozie?job=0000070-131021115933397-oozie-rgau-W",
-            "status": "RUNNING",
-            "instance": "2012-04-03T08:00Z"
-        },
-    ],
-
-    "requestId": "default\/e15bb378-d09f-4911-9df2-5334a45153d2\n",
-    "message": "default\/STATUS\n",
-    "status": "SUCCEEDED"
-}
-</verbatim>
-

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/InstanceStatus.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/InstanceStatus.twiki b/trunk/releases/master/src/site/twiki/restapi/InstanceStatus.twiki
deleted file mode 100644
index 2b7b643..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/InstanceStatus.twiki
+++ /dev/null
@@ -1,98 +0,0 @@
----++  GET /api/instance/status/:entity-type/:entity-name
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-Get status of a specific instance of an entity.
-
----++ Parameters
-   * :entity-type Valid options are cluster, feed or process.
-   * :entity-name Name of the entity.
-   * start <optional param> Show instances from this date. Date format is yyyy-MM-dd'T'HH:mm'Z'.
-      * By default, it is set to (end - (10 * entityFrequency)).
-   * end <optional param> Show instances up to this date. Date format is yyyy-MM-dd'T'HH:mm'Z'.
-      * Default is set to now.
-   * colo <optional param> Colo on which the query should be run.
-   * lifecycle <optional param> Valid lifecycles for feed are Eviction/Replication(default) and for process is Execution(default).
-   * filterBy <optional param>  Filter results by list of field:value pairs. Example: filterBy=STATUS:RUNNING,CLUSTER:primary-cluster
-      * Supported filter fields are STATUS, CLUSTER, SOURCECLUSTER, STARTEDAFTER.
-      * Query will do an AND among filterBy fields.
-   * orderBy <optional param> Field by which results should be ordered.
-      * Supports ordering by "status","startTime","endTime","cluster".
-   * sortOrder <optional param> Valid options are "asc" and "desc"
-   * offset <optional param> Show results from the offset, used for pagination. Defaults to 0.
-   * numResults <optional param> Number of results to show per request, used for pagination. Only integers > 0 are valid, Default is 10.
-   * doAs <optional query param> allows the current user to impersonate the user passed in doAs when interacting with the Falcon system.
-   * allAttempts <optional query param> To get all the attempts for corresponding instances.
-   
----++ Results
-Status of the specified instance along with job urls for all actions of user workflow and non-succeeded actions of the main-workflow.
-
----++ Examples
----+++ Rest Call
-<verbatim>
-GET https://localhost:15443/api/instance/status/process/WordCount?start=2014-11-04T16:00Z&colo=*
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "instances": [
-        {
-            "details": "",
-            "endTime": "2014-11-05T16:08:10+05:30",
-            "startTime": "2014-11-05T16:07:29+05:30",
-            "cluster": "local",
-            "logFile": "http:\/\/localhost:11000\/oozie?job=0000011-141105155430303-oozie-oozi-W",
-            "status": "SUCCEEDED",
-            "instance": "2014-11-04T16:00Z",
-            "actions": [
-                {
-                    "action": "wordcount-mr",
-                    "status": "SUCCEEDED",
-                    "logFile": "http:\/\/localhost:50030\/jobdetails.jsp?jobid=job_201411051553_0005"
-                }
-            ]
-        }
-    ],
-    "requestId": "default\/b9fc3cba-1b46-4d1f-8196-52c795ea3580\n",
-    "message": "default\/STATUS\n",
-    "status": "SUCCEEDED"
-}
-</verbatim>
-
-
----+++ Rest Call
-<verbatim>
-GET http://localhost:15000/api/instance/status/process/SampleProcess?colo=*&start=2012-04-03T07:00Z&filterBy=STATUS:SUCCEEDED,CLUSTER:primary-cluster&orderBy=startTime&offset=2&numResults=2&doAs=joe
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "instances": [
-        {
-            "details": "",
-            "endTime": "2013-10-21T14:40:26-07:00",
-            "startTime": "2013-10-21T14:39:56-07:00",
-            "cluster": "primary-cluster",
-            "logFile": "http:\/\/localhost:11000\/oozie?job=0000070-131021115933395-oozie-rgau-W",
-            "status": "SUCCEEDED",
-            "instance": "2012-04-03T07:00Z"
-        },
-        {
-            "details": "",
-            "endTime": "2013-10-21T14:42:26-07:00",
-            "startTime": "2013-10-21T14:41:56-07:00",
-            "cluster": "primary-cluster",
-            "logFile": "http:\/\/localhost:11000\/oozie?job=0000070-131021115933397-oozie-rgau-W",
-            "status": "SUCCEEDED",
-            "instance": "2012-04-03T08:00Z"
-        },
-    ],
-
-    "requestId": "default\/e15bb378-d09f-4911-9df2-5334a45153d2\n",
-    "message": "default\/STATUS\n",
-    "status": "SUCCEEDED"
-}
-</verbatim>

http://git-wip-us.apache.org/repos/asf/falcon/blob/4e4b8457/trunk/releases/master/src/site/twiki/restapi/InstanceSummary.twiki
----------------------------------------------------------------------
diff --git a/trunk/releases/master/src/site/twiki/restapi/InstanceSummary.twiki b/trunk/releases/master/src/site/twiki/restapi/InstanceSummary.twiki
deleted file mode 100644
index 0e1ffee..0000000
--- a/trunk/releases/master/src/site/twiki/restapi/InstanceSummary.twiki
+++ /dev/null
@@ -1,114 +0,0 @@
----++  GET /api/instance/summary/:entity-type/:entity-name
-   * <a href="#Description">Description</a>
-   * <a href="#Parameters">Parameters</a>
-   * <a href="#Results">Results</a>
-   * <a href="#Examples">Examples</a>
-
----++ Description
-Get summary of instance/instances of an entity.
-
----++ Parameters
-   * :entity-type Valid options are feed or process.
-   * :entity-name Name of the entity.
-   * start <optional param> Show instances from this date. Date format is yyyy-MM-dd'T'HH:mm'Z'.
-       * By default, it is set to (end - (10 * entityFrequency)).
-   * end <optional param> Show instances up to this date. Date format is yyyy-MM-dd'T'HH:mm'Z'.
-       * Default is set to now.
-   * colo <optional param> Colo on which the query should be run.
-   * lifecycle <optional param> Valid lifecycles for feed are Eviction/Replication(default) and for process is Execution(default).
-   * filterBy <optional param>  Filter results by list of field:value pairs.
-   Example1: filterBy=STATUS:RUNNING,CLUSTER:primary-cluster
-   Example2: filterBy=Status:RUNNING,Status:KILLED
-       * Supported filter fields are STATUS, CLUSTER
-       * Query will do an AND among filterBy fields.
-   * orderBy <optional param> Field by which results should be ordered.
-       * Supports ordering by "cluster".
-   * sortOrder <optional param> Valid options are "asc" and "desc"
-   Example: orderBy=cluster sortOrder=asc
-   * doAs <optional query param> allows the current user to impersonate the user passed in doAs when interacting with the Falcon system.
-
----++ Results
-Summary of the instances over the specified time range
-
----++ Examples
----+++ Rest Call
-<verbatim>
-GET http://localhost:15000/api/instance/summary/process/WordCount?colo=*&start=2014-01-21T13:00Z&end=2014-01-21T16:00Z
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "status":"SUCCEEDED",
-    "message":"default/SUMMARY\n",
-    "requestId":"default/c344567b-da73-44d5-bcd4-bf456524934c\n",
-    "instancesSummary":
-        {
-            "cluster":"local",
-            "map":
-                {
-                    "entry":
-                        {
-                            "key":"SUCCEEDED",
-                            "value":"value"
-                         }
-                }
-            }
-        }
-}
-</verbatim>
-
----+++ Rest Call
-<verbatim>
-GET https://localhost:16443/api/instance/summary/process/WordCount?filterBy=Status:KILLED,Status:RUNNING&start=2015-06-24T16:00Z&end=2015-06-24T23:00Z&colo=*
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "status":"SUCCEEDED",
-    "message":"local/SUMMARY\n",
-    "requestId":"local/1246061948@qtp-1059149611-5 - 34d8c3bb-f461-4fd5-87cd-402c9c6b1ed2\n",
-    "instancesSummary":[
-        {
-            "cluster":"local",
-            "map":{
-                "entry":{
-                    "key":"RUNNING",
-                    "value":"1"
-                },
-                "entry":{
-                    "key":"KILLED",
-                    "value":"1"
-                }
-            }
-        }
-    ]
-}
-</verbatim>
-
----+++ Rest Call
-<verbatim>
-GET https://localhost:16443/api/instance/summary/process/WordCount?orderBy=cluster&sortOrder=asc&start=2015-06-24T16:00Z&end=2015-06-24T23:00Z&colo=*&doAs=joe
-</verbatim>
----+++ Result
-<verbatim>
-{
-    "status":"SUCCEEDED",
-    "message":"local/SUMMARY\n",
-    "requestId":"local/1246061948@qtp-1059149611-5 - 42e2040d-6b6e-4bfd-a090-83db5ed1a429\n",
-    "instancesSummary":[
-        {
-            "cluster":"local",
-            "map":{
-                "entry":{
-                    "key":"SUCCEEDED",
-                    "value":"6"
-                },
-                "entry":{
-                    "key":"KILLED",
-                    "value":"1"
-                }
-            }
-        }
-    ]
-}
-</verbatim>